Merge pull request #20 from OmgImAlexis/master

Merging
Merge pull request #22 from OmgImAlexis/shnupbups

Merge pull request #20 from OmgImAlexis/master