Fix various mistakes
Fix other mistakes
Merge pull request #30 from utybo/master

Fix various mistakes