updates
Merge pull request #7 from tengbao/master

updates