didn't properly push
Merge branch 'hotfix/1.0.6' into develop