Fix bug x
Merge branch 'hotfix-1.0.1' into develop