improve the help string and reduce the unneeded configs
Merge branch 'master' into testScripts

Conflicts:
	README.md
Merge pull request #20 from andyque/testScripts

improve the help string and reduce the unneeded configs