cleaning python branch
adding command line options from bash version