Merge branch 'dev' into leacoco
[leacoco] change made by Readme file on leacoco
merge conflict chenged