bugfixes
Merge pull request #46 from Tritlo/master

bugfixes