Merge pull request #86 from chuckdumont/master

Update //$NON-NLS-1$ comments
Merge remote-tracking branch 'jaggr/master'