fix encoding issue
Merge branch 'develop' into autodetect-terminal-size