Fixed issues #24 and #18

Fixed: https://github.com/ammoio/ammo/issues/24
Fixed: https://github.com/ammoio/ammo/issues/18