Added unicode support, resolves issue #6