Merge pull some request #1 from Lao-liu/master