Bugfixing
Merge pull request #6 from wagnert/master

Bugfixing