Merge pull request #8 from Awful/master

string stuff
Merge pull request #291 from Sereri/master

Merge pull request #8 from Awful/master