added support for command line arguments and comments