Dirty fix. Works, but it's ugly.
Issue #21
Merge branch 'encoding-bug'