add version file
Merge branch 'master' into v0.20
fix some comments