switched back from paste
added try catch around notes
Merge remote-tracking branch 'upstream/master'