Fixed more stuff
Merge pull request #24 from tmas/master

Fixed more stuff