Test and fix for issue 109
Merge pull request #111 from abliss/issue-109

Issue 109