added command line options support