Merge branch 'hotfix-1.0.2'
Merged with 1.0.2
Fixed bug 1.0.3
Fixed bug 1.0.3