Bugfix
Merge pull request #73 from scento/master

Bugfix for #72