notice update
documentation
Merge branch 'master' into minor
docs update