issue #10 fixed
Merge branch 'hotfix/Issue10'