Merge pull request #918 from rxwei/master