Added command line option for #50 in CBH