Unicode support
Merge branch 'master' into unicode
Merge pull request #3 from jml/unicode

Correctly support unicode in parser