Merge pull request #4 from aTastyCookie/master

pull request