Merge pull request #1 from sc1885/master

Sync the latest