Merge pull request #1 from jackzhang1204/master

update