Merge branch 'develop'
Version updated to 0.0.4.
Merge branch 'master' into develop