add readme
add settings
Merge branch 'master' into 160rc1