More intelegent way to pass arguments to the CLI
Preg_match improvement. Fixed #122