Merge branch 'hotfix/0.0.3'
Merge branch 'release/0.0.4'
blah test fix
Merge branch 'hotfix/0.0.4.1' into develop