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