upate the README and the help output
Merge branch 'master' into remove_warnings