Final check before 2.1 release. Added a version