Feature/1.2

merge 1.2 feature