Added notes
Added notes
Merge branch 'feature/notes' into develop