Merge pull request #1 from dgq2010/master

update code