Fixes Issue #72
Merge pull request #84 from bswinnerton/master

Fix #72