Issue #7 work
Merge branch 'notes' into development