minor update / notes
Merge branch 'master' into feature/configuration
split feature branch