Updated to latest version of @Notepad