added branch 3B
Merge branch 'master' into thirdBranch