Release v0.4.0
 Merge into master
 Increased version for development