added comand line support