Fixed several hard coded strings.
Merge pull request #2 from VEINHORN/master

Fixed several hard coded strings.