changes b4 merge
Merge branch 'Lu-Tao'