Update license and readme
Merge branch 'release/2.0' into develop