add Version 1.0 code
Merge branch 'chin'