strict utf-8 checking
Merge branch 'tmp'