Release 1.2
Confilict resolved