Merge branch 'hotfix/Issue#15'
Issue#16 Solved
Merge branch 'hotfix/Issue#16' into develop