V 1.2.1 beta

Merging 1.2.1 beta branch back to master