Handle UTF-8 on Python 2

This reverts part of 5dda2ca000a222126304d4a218a0b801b947dd9d and fixes
issue #6.
2 files changed