Merge pull request #1 from Shaz3e/master

Sync with the Master
Merge pull request #6 from DiligentCreators/master

Merge pull request #1 from Shaz3e/master