updated example configs and docs
Merge remote branch 'origin/master'