Merge pull request #866 from daixihegu/master