Finally a working merge u.u
Merge pull request #3 from berdav/note_finder

Finally a working merge u.u