Merge pull request #1162 from abelcheung/master

All charsets can be auto-generated from external source now