Merge branch 'master', remote branch 'origin/master'
* Add option list to ejpet_scanner:tokenize.
* Add UTF8 support.