Version1.2

merge version 1.2.0 changes into master