Merge pull request #3 from ZomgPonies/master

Master merges
Merge pull request #4 from ZomgPonies/zomgponies

Merge pull request #3 from ZomgPonies/master