Unit Test for #82
Fixes #82
Fixes #82
Merge pull request #87 from ovatsus/master

Fix for #82