Merge pull request #2 from aTastyCookie/master

Merge pull request #2 from aTastyCookie/master