some cosmetics
Merge branch 'release'