Merge branch 'notes'