Fixed Unicode support, also formatted for pep8