Fixed #26"
Merge branch 'hotfix/Issue#26'