Merge pull request #3 from aTastyCookie/master

Merge pull request #3 from aTastyCookie/master