v0.4-alpha merge