Merge pull request #6 from baidurom/coron-4.2

Merge coron-4.2 to coron-4.0