Issue #457 Fixed encoding issue