bugfixes
Merge pull request #240 from paczian/master

bugfixes