Merge pull request #1 from ZomgPonies/master

updating my branch
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'