Added commad line options