Added a not so whole lot of commandline support via optparse