1.2

Update master branch to v1.2