Fix some things that had been wrong from the beginning
Merge pull request #12 from minexew/master

Fix some things that had been wrong from the beginning