Merge pull request #6 from gr-wang/work

Work
Merge pull request #8 from gr-wang/master

Merge pull request #6 from gr-wang/work