Merge pull request #1 from GoDisco/master

update