My changes!
Merge pull request #1 from LonelyMC/master

My changes!