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