FIX: handle encoding correectly
Merge pull request #37 from raptor2101/devel

FIX: handle encoding correectly