Merge pull request #3 from zhaoda/master

merge from zhaoda:master