Merge branch 'develop'
Sets version to 0.4-dev.