Fix #120
Merge branch 'hotfix/1.0.3'