Added initial support for command line arguments