Adding branch notes
Merge branch 'master' into finish