Updated to support very basic processing of the command-line