Fix for issue #87
Merge pull request #88 from chriscz/master

Fix for issue #87