Merge pull request #20 from OmgImAlexis/master

Merging