Improved notes extraction + some refactoring

Improved notes extraction + some refactoring
Merge branch 'master' of https://github.com/cscenter/uNotes