Fix some more stuff
Merge pull request #8 from schilit/master

Fix some more stuff