Merge pull request #17 from OmgImAlexis/master

Pulling from master.
Merge pull request #19 from OmgImAlexis/shnupbups

Just making sure everything's nice.