fix jshint bugs
Merge branch 'feature/notes'