Updated according to the standard strings.
Merge pull request #27 from notetiene/master

Updated according to the standard strings.