Fixed encodings for python3.4
Removed commmented changes
Merge pull request #1 from fmder/fix-encoding

Fix encoding