Merge pull request #1 from Chantilly612Code/master

Merging