Final commit for the 1.0 version.