Merge pull request #1 from HPNeo/master

Resync