Merge branch 'thuai2-master'
Merge branch 'master' of github.com:thuai/fork