Added additional option
Added better argument handling