fix for #109 with unit test
Merge pull request #110 from burgerdev/issue-109

fix for #109 with unit test