Final commit for 1.0.1b