merge changes made to Npp plugin