Bump to 0.0.4
Merge branch 'release/0.0.4'
Merge branch 'master' into develop
Merge develop and fix conflicts