Merge pull request #1 from wfyson/master

In sync