Merge pull request #3 from AtreyuShoper/master

Merging