added b3
Merge branch 'master' into b3