Merge pull request #1 from vastwu/master

update
test
Merge pull request #2 from xuzheng/branch_20130815

Branch 20130815