added regular expressions support