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