Minor bugfixes
Merge pull request #3 from SimonEbner/master

Bugfixes