merge David's new string constants.
Merge remote-tracking branch 'upstream/master'
Merge pull request #37 from topcircler/master

Refine string constants on behalf of David