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