command line enhanced options, bugfix

fix #6 #7