Added some command line option support and the ability to autodetect namespace