1.2

Merging the v1.2 to master.