Fix for issue #202
Merge pull request #225 from davidalger/feature/issue-202

Fix for issue #202