Final commit for 1.0