merge from origin #6

Closed wangzhizhou closed 7 years ago