Merge pull request #5 from aTastyCookie/master

update