Fixed mah bugs @CaptainShadows :P fixes #17 and #9
Revert 55b4b57..abbccdb

This rolls back to commit 55b4b57994078ba144b5f55214d7508690d42b6a.
fixes #17 & #9
Merge pull request #19 from TuxCraft/master

fixes #17 and #9