Encoding! Encoding! Encoding!
Merge pull request #87 from ernstchan/bugfixes

Encoding! Encoding! Encoding!