Merge pull request #1 from elOjoVigilante/master

Push it
SUXES!!
Merge pull request #2 from poochiemonster5000/master

Push it