Now using C++11 regex instead of boost::regex