solved Issue#8
Merge branch 'hotfix/Issue#8'