Bugfixes; added libraries
Merge branch 'master' of https://github.com/nikkou/notes