Commit v0.4 beta