Initial v0.9.5 commit