Added support for several command-line options
Updated README and minor changes