--- a/streamlet-examples/streamlet-common.h	Mon Jan 27 00:43:39 2020 +0100
+++ b/streamlet-examples/streamlet-common.h	Tue Jan 28 14:26:39 2020 +0100
@@ -23,6 +23,7 @@
 #include <sstream>
 #include <codecvt>
 #include <locale>
+#include <regex>
 
 #include "../src/StreamletMsg.h"
 
@@ -36,7 +37,7 @@
 using S = relpipe::in::filesystem::StreamletMsg;
 
 class Streamlet {
-private:
+protected:
 
 	class Message {
 	public:
@@ -59,6 +60,8 @@
 		}
 	};
 
+private:
+
 	static const char SEPARATOR = '\0';
 
 	int readInt() {
@@ -93,6 +96,14 @@
 		return m;
 	}
 
+	/**
+	 * The std::wsmatch contains only references to original string,
+	 * so we need to copy it in order to make it persistent and independent from variables that may evaporate.
+	 */
+	void copyMatches(std::wsmatch& source, std::vector<std::wstring>& destination) {
+		for (std::wstring s : source) destination.emplace_back(s);
+	}
+
 	void processMessages() {
 		while (true) {
 			Message m = read();
@@ -128,6 +139,11 @@
 	public:
 		std::wstring name;
 		std::wstring value;
+		std::vector<std::wstring> nameMatch;
+		std::vector<std::wstring> valueMatch;
+
+		Option(std::wstring name, std::wstring value) : name(name), value(value) {
+		}
 	};
 
 	std::vector<std::wstring> versionsSupported;
@@ -201,6 +217,38 @@
 		else return defaultValue;
 	}
 
+	virtual std::vector<Option> getOptions(std::wstring name) {
+		std::vector<Option> result;
+		for (Option o : options) if (o.name == name) result.push_back(o);
+		return result;
+	}
+
+	virtual std::vector<Option> getOptions(std::wregex namePattern) {
+		std::vector<Option> result;
+		std::wsmatch nameMatch;
+		for (Option o : options) if (std::regex_match(o.name, nameMatch, namePattern)) {
+				copyMatches(nameMatch, o.nameMatch);
+				result.push_back(o);
+			}
+		return result;
+	}
+
+	virtual std::vector<Option> getOptions(std::wregex namePattern, std::wregex valuePattern) {
+		// TODO: support multiple modes: 
+		//   a) throw an exception if valuePattern does not match
+		//   b) return option even if valuePattern does not match (valueMatch will be empty)
+		//   c) skip options with value not matching (current behavior)
+		std::wsmatch nameMatch;
+		std::wsmatch valueMatch;
+		std::vector<Option> result;
+		for (Option o : options) if (std::regex_match(o.name, nameMatch, namePattern) && std::regex_match(o.value, valueMatch, valuePattern)) {
+				copyMatches(nameMatch, o.nameMatch);
+				copyMatches(valueMatch, o.valueMatch);
+				result.push_back(o);
+			}
+		return result;
+	}
+
 	virtual std::vector<AttributeMetadata> getOutputAttributesMetadata() = 0;
 	virtual std::vector<OutputAttribute> getOutputAttributes() = 0;
 
@@ -213,7 +261,11 @@
 		try {
 			processMessages();
 			return 0;
+		} catch (std::exception& e) {
+			write({S::STREAMLET_ERROR, L"xxxx", L"Exception in streamlet: " + convertor.from_bytes(e.what())}); // FIXME: correct error codes
+			return 1;
 		} catch (...) {
+			write({S::STREAMLET_ERROR, L"xxxx", L"Unknown exception in streamlet."}); // FIXME: correct error codes
 			return 1;
 		}
 	}
@@ -225,6 +277,7 @@
 
 #define STREAMLET_RUN(clazz) \
 int main(int argc, char** argv) { \
+	setlocale(LC_ALL, ""); \
 	clazz s; \
 	return s.run(); \
 }