Merge pull request #1 from bpred754/master

This is so gay
Merge pull request #3 from helikaon00/master

Uhhhh