bugfixes
Merge pull request #85 from hajgato/bugfix

bugfixes