Merge branch 'origin/master'
added notes
Merge branch 'Development'