Add shorthand for charset detecter
Merge branch 'master' into 4.x
Fix es6 charset detecter