Version 1.1 bugs fixed
Merge branch 'master' into my_branch_1