Fix #2 -- correctly deal with unicode data