merge test by jimmy.
Merge pull request #2 from gr-wang/work

merge test by jimmy.