version1.1 Bug fixed
Merge branch 'master' into v2-feature1