initial commit
Merge https://github.com/chinghua0731/test