Initial 0.4.0 commit