Work on #658
Work on #658

thomasfanell/rock,shamanas/rock,davidhesselbom/rock,fredrikbryntesson/rock,fasterthanlime/rock,marcusnaslund/rock,ooc-lang/rock,shamanas/rock,marcusnaslund/rock,davidhesselbom/rock,ds84182/rock,cogneco/rock,magic-lang/rock,zhaihj/rock,magic-lang/rock,jonathanudd/rock,kirbyfan64/rock,kirbyfan64/rock,thomasfanell/rock,fredrikbryntesson/rock,zhaihj/rock,ds84182/rock,ooc-lang/rock,fasterthanlime/rock,cogneco/rock,jonathanudd/rock