Final 1.0.1 commit