Merge branch 'release/Issue#21v3'
Solved Issue#21
Merge branch 'hotfix/Issue#21v4' into develop