Merge pull request #1 from RaymondLui/master

merge me