Added unit test for issue #84.
Fix issue #84.
Merge pull request #85 from pgelinas/issue-84

Unit test and fix for issue #84