Final commit for version 2.1