Merge pull request #3 from ZomgPonies/master

Master merges