merge with larry's version
Merge branch 'master' of https://github.com/larryPersonal/Nanhua