Merge branch 'New-Featues-1.1'