Added support for unicode strings and the --raw flag