Merge pull request #8 from Awful/master

string stuff