Closes #632. Closes #633. Thanks to the amazing @zhaihj
Closes #632. Closes #633. Thanks to the amazing @zhaihj

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