Merge rev 17
Merge rev 18
Merge rev 19
avoid compiler warning about ambiguous type conversion
Merge pull request #33 from tbeu/update-from-NppFTP

Update from NppFTP SVN