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