Merge pull request #1 from ZomgPonies/master

Merge