diff --git a/websocketpp/uri.hpp b/websocketpp/uri.hpp
index b0c7f38f28..a287fa9f91 100644
--- a/websocketpp/uri.hpp
+++ b/websocketpp/uri.hpp
@@ -281,6 +281,14 @@ public:
         s << m_resource;
         return s.str();
     }
+    
+    std::string const get_query() const {
+    	std::size_t found =  m_resource.find("?");
+    	if (found > 0)
+    		return m_resource.substr(found + 1);
+    	else
+            return "";
+    }
 
     // get query?
     // get fragment