Merge pull request #81 from DSoftOut/issue-80

Issue 80
Failing test case
Fix for issue #79