Issue #78 solution
Merge pull request #94 from emmgfx/patch-1

Issue #78 solution