Better command line support (added options and ctrl+c)