Fixed more Unicode problems
Merge pull request #34 from ukdtom/tommy-work

Fixed more Unicode problems