Fix for #93
Merge pull request #94 from djlestephane/master

Fix for #93