Another attempt to fix #36
Merge pull request #39 from steffann/patch-2

Another attempt to fix #36