Fix for issue #32
Merge pull request #36 from bestscarper/master

Fix for issue #32