1.2.1 release, merge Daves contribution