Merge pull request #2 from zhaoda/master

merge from zhaoda:master