bringing v0.4 closer to master