Solved Issue #6
Merge branch 'hotfix/Issue#6'
Solved Close #6