bugfixes
Merge pull request #3 from jpospychala/master

bugfixes