Fixed position of notes
Merge branch 'master' into stable