some notes
more notes
Merge branch 'Development'