Added ability to use long command line args
Updated code to be able to use other params