Bugfix Issue #57
Merge pull request #58 from fbergkemper/master

Bugfix Issue #57