cleanup and added defaults to cli arguments
Merge pull request #12 from TMaddox/master

cleanup and added defaults to cli arguments