Regex support

Ready to merge