third commit from wangxinlu
Merge branch 'master' into second_branch