Merge pull request #1 from zhaoda/master

merge