Release 0.4.0
merging in master