Merge branch 'hotfix/Issue#22'
Merge branch 'release/Issue#10v1'
Solved Issue#23
Merge branch 'hotfix/Issue#23' into develop