Bugfixing
Merge pull request #7 from wagnert/master

Bugfixing