Merge branch 'hotfix/Issue#17'
Solved Issue#18
Solved Issue#18
Merge branch 'hotfix/Issue#18' into develop