Final commit before 1.0