Resolve #50
Merge branch 'hotfix/1.0.5'