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