Merge pull request #1 from RaymondLui/master

merge me
Merge pull request #2 from jaywonnng/master

Merge pull request #1 from RaymondLui/master