Merge branch 'hotfix/Issue#16'
Merge branch 'release/Issue#1'
Solved Issue#17
Merge branch 'hotfix/Issue#17' into develop