Merge branch 'publish'
minor adjustments
Merge branch 'master' into publish