Merge branch 'updated-Notepad2'