py3 encoding fixes in tests
Version 0.2.6
Merge branch 'master' into gh-pages