Merge pull request #1 from wfyson/master

In sync
Merge pull request #9 from loleg/master

Merge pull request #1 from wfyson/master