Solve Issue#19
Merge branch 'hotfix/Issue#19'