Modify error notifier
update note
Merge branch 'master' into develop