Fixed README and made command line helper a bit more flexible