Merge pull request #43 from OmgImAlexis/master

p
Merge pull request #47 from OmgImAlexis/shnupbups

Merge pull request #43 from OmgImAlexis/master