Fix notes
Bugfix
Merge branch 'develop'