Update maintainer email in package definition
Bump version number
Merge branch 'release/0.4' into develop