Merge branch 'hotfix/0.0.8'
oops x-(
Merge branch 'hotfix/oops' into develop