Added CLI interface support
reverted heavy URL testing regexps