copy file
Merge branch 'huanchen'
with new test code