Bump version to 0.4 and fix setup.py
Merge branch 'release/0.4' into develop
Bump to 0.5dev