add options for the CLI test
Merge branch 'master' of github.com:IndigoUnited/node-1

Conflicts:
	README.md