Some updates from Yu-Fang
Merge branch 'master' of https://github.com/fmlab-iis/transformer
Some updates from Yu-Fang