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