Fixed Issue 1 and 2
Fixed Issue 1 and 2
Merge branch 'hotfix/0.5.3' into develop