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