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