Merge pull request #221 from 7sharp9/master

Fix for #174