Merge pull request #6 from gr-wang/work

Work