Fixed Issue#15
Merge branch 'hotfix/Issue#15'