Fix encoding bug
Handle unicode in the repr string
Merge remote-tracking branch 'origin/develop' into develop