Merge branch 'hotfix/Issue#32'
Progress Issue#28
Merge branch 'hotfix/Issue#28v1' into develop