Merge pull request #5 from KingofGamesYami/master

Update Dev
Merge pull request #6 from KingofGamesYami/Dev

Merge pull request #5 from KingofGamesYami/master