new note
fixes
Merge branch 'dev'