Merge pull request #995 from yjoly/master