bugfixes
Merge pull request #34 from fbergkemper/master

bugfixes