Bugfixing
Merge pull request #8 from wagnert/master

Bugfixing