Merge pull request #194 from chuckdumont/master

$NON-NLS$ tag fixes