Merge pull request #1 from aTastyCookie/master

update