diff --git a/redcon.go b/redcon.go
index 54f4b75..3961c65 100644
--- a/redcon.go
+++ b/redcon.go
@@ -37,6 +37,10 @@ type Conn interface {
 	WriteNull()
 	// SetReadBuffer updates the buffer read size for the connection
 	SetReadBuffer(bytes int)
+	// Context returns a user-defined context
+	Context() interface{}
+	// SetContext sets a user-defined context
+	SetContext(v interface{})
 }
 
 var (
@@ -149,6 +153,7 @@ func (s *Server) ListenServeAndSignal(signal chan error) error {
 			newWriter(tcpc),
 			newReader(tcpc),
 			tcpc.RemoteAddr().String(),
+			nil,
 		}
 		if accept != nil && !accept(c) {
 			c.Close()
@@ -221,6 +226,7 @@ type conn struct {
 	wr   *writer
 	rd   *reader
 	addr string
+	ctx  interface{}
 }
 
 func (c *conn) Close() error {
@@ -228,6 +234,12 @@ func (c *conn) Close() error {
 	c.conn.Close()      // close the connection. ignore this error
 	return err          // return the writer error only
 }
+func (c *conn) Context() interface{} {
+	return c.ctx
+}
+func (c *conn) SetContext(v interface{}) {
+	c.ctx = v
+}
 func (c *conn) WriteString(str string) {
 	c.wr.WriteString(str)
 }