Fix issue #51
Merge pull request #52 from maennchen/master

Fix issue #51