Merge pull request #8 from baidurom/coron-4.2

Merge coron-4.2 into coron-4.1