Fixed bug 1.0.3
Merge branch 'hotfix-1.0.3'