Fix for #104
Merge pull request #114 from mdissel/master

Fix for #104