Merge of new features and bug-fixes from https://github.com/kubaurban/knotes
Merge of new features and bug-fixes from https://github.com/kubaurban/knotes