Fix stuff
Merge pull request #10 from derek63/master

Fix stuff