Fixed #22
Fixed #22
Merge branch 'hotfix/Issue#22'