Merge pull request #292 from jamezmoran/master

Unicode changes