Merge pull request #1 from Shaz3e/master

Sync with the Master