Merge branch 'dev'
Preparing fora new release
Release 0.4rel
Merge branch 'master' into dev
Bump version 0.5 pre