Bugfixes
Merge pull request #20 from miuzel/master

Bugfixes