fixed notes
Merge branch 'dev'