Solved Issue#27
Merge branch 'hotfix/Issue#27'