Release 0.4 (mostly broken!)
Change version to 0.5-SNAPSHOT for development
Merge remote-tracking branch 'origin/master'