merged with master branch, in wich add deletion function for notes