Updated for latest N++ (6.3.2)