Sesson notes completed
Merge origin/master