updated for 0.4.0 rc0