Added notes
Merging origin/master