Basic fix for utf8 decoder issues.

Issue #47

This is just a hot fix. It needs more testing before closing the issue.