Fix issue #108
Merge pull request #124 from stephpy/fix_41

Fix issue #41.