Merge branch 'hotfix/Issue#29'
Solved Issue#32
Merge branch 'hotfix/Issue#32' into develop