Fix for issue #149
Merge pull request #150 from ehsteve/master

Fix for issue #149