Merge pull request #128 from akihiro/master

Add non UTF-8 encoding support