Merge pull request #292 from jamezmoran/master

Unicode changes
Merge pull request #12 from Awful/master

Merge pull request #292 from jamezmoran/master