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