Issue#16 Solved
Merge branch 'hotfix/Issue#16'