V. 1.2
Merge branch 'release-1.2'