Update 1.1
Merge branch 'Update-1.1'