Merge branch 'feature/note2freq'