diff --git a/.gitignore b/.gitignore
index 45b4a94..4f67da3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,7 @@ fabric.properties
 # Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
 .glide/
 .idea/
+*.iml
+
+vendor/
+glide.lock
\ No newline at end of file
diff --git a/grpc/cmd b/grpc/cmd
index 6653aaf..77ace0b 100644
--- a/grpc/cmd
+++ b/grpc/cmd
@@ -1,3 +1,3 @@
-protoc  -I/usr/local/include -I$GOPATH/src -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis -I grpc/ grpc/grpc.proto --go_out=plugins=grpc:grpc
+protoc  -I/usr/local/include -I. -I$GOPATH/src -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis -I grpc/ grpc/grpc.proto --go_out=plugins=grpc:grpc
 
 protoc  -I/usr/local/include -I$GOPATH/src -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis -I grpc/ grpc/grpc.proto --grpc-gateway_out=logtostderr=true:grpc
\ No newline at end of file
diff --git a/grpc/grpc.pb.go b/grpc/grpc.pb.go
index 41c4c65..a0e7ae4 100644
--- a/grpc/grpc.pb.go
+++ b/grpc/grpc.pb.go
@@ -1,11 +1,11 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: grpc.proto
+// source: grpc/grpc.proto
 
 /*
 Package gwrpc is a generated protocol buffer package.
 
 It is generated from these files:
-	grpc.proto
+	grpc/grpc.proto
 
 It has these top-level messages:
 	ServiceInput
@@ -156,29 +156,30 @@ var _OverflowGateway_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "grpc.proto",
+	Metadata: "grpc/grpc.proto",
 }
 
-func init() { proto.RegisterFile("grpc.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("grpc/grpc.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 286 bytes of a gzipped FileDescriptorProto
+	// 289 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x41, 0x4a, 0xc3, 0x40,
-	0x14, 0x86, 0x49, 0x42, 0x84, 0xbe, 0x56, 0x94, 0xb1, 0x42, 0x09, 0xa5, 0x84, 0xac, 0x8a, 0x60,
-	0x82, 0xd5, 0x45, 0xe9, 0xbe, 0x88, 0x1b, 0x2b, 0xed, 0xd2, 0xd5, 0x18, 0xc7, 0x18, 0x4c, 0x66,
-	0x86, 0xc9, 0x4b, 0x62, 0xb6, 0x5e, 0xc1, 0x0b, 0x79, 0x07, 0xaf, 0xe0, 0x41, 0x24, 0x99, 0x91,
-	0x46, 0xe8, 0x6e, 0xde, 0xc7, 0xc7, 0xff, 0xbf, 0x79, 0x00, 0x89, 0x92, 0x71, 0x28, 0x95, 0x40,
-	0x41, 0xdc, 0xa4, 0x56, 0x32, 0xf6, 0xa6, 0x89, 0x10, 0x49, 0xc6, 0x22, 0x2a, 0xd3, 0x88, 0x72,
-	0x2e, 0x90, 0x62, 0x2a, 0x78, 0xa1, 0xa5, 0xe0, 0xcb, 0x82, 0xd1, 0x8e, 0xa9, 0x2a, 0x8d, 0xd9,
-	0x1d, 0x97, 0x25, 0x12, 0x1f, 0x86, 0x85, 0x9e, 0xef, 0x69, 0xce, 0x26, 0x96, 0x6f, 0xcd, 0x07,
-	0xdb, 0x3e, 0x22, 0x33, 0x80, 0x9c, 0xe1, 0xab, 0x78, 0xee, 0x04, 0xbb, 0x13, 0x7a, 0x84, 0xdc,
-	0x80, 0x2b, 0xa9, 0xa2, 0xf9, 0xc4, 0xf1, 0x9d, 0xf9, 0x70, 0x31, 0x0b, 0xbb, 0x3d, 0xc2, 0x7e,
-	0x4b, 0xf8, 0xd0, 0x0a, 0x6b, 0x8e, 0xaa, 0xd9, 0x6a, 0xd9, 0x5b, 0x02, 0xec, 0x21, 0x39, 0x05,
-	0xe7, 0x8d, 0x35, 0xa6, 0xbd, 0x7d, 0x92, 0x31, 0xb8, 0x15, 0xcd, 0xca, 0xbf, 0x42, 0x3d, 0xac,
-	0xec, 0xa5, 0x15, 0x5c, 0xc2, 0xb1, 0xc9, 0xde, 0x94, 0xd8, 0x7e, 0x61, 0x0a, 0x03, 0xc5, 0x8a,
-	0x32, 0xc3, 0x1d, 0x2a, 0x13, 0xb1, 0x07, 0x0b, 0x0e, 0x27, 0x9b, 0x8a, 0xa9, 0x97, 0x4c, 0xd4,
-	0xb7, 0x14, 0x59, 0x4d, 0x1b, 0xf2, 0x08, 0xa3, 0xf5, 0x3b, 0x8b, 0x4d, 0x4a, 0x41, 0xce, 0x0e,
-	0xac, 0xec, 0x8d, 0xff, 0x43, 0xdd, 0x15, 0xf8, 0x1f, 0xdf, 0x3f, 0x9f, 0xb6, 0x17, 0x9c, 0x47,
-	0xd5, 0x55, 0x24, 0x4c, 0x6e, 0x64, 0xce, 0x55, 0xac, 0xac, 0x8b, 0xa7, 0xa3, 0xee, 0xd0, 0xd7,
-	0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb2, 0x2e, 0x3f, 0x2b, 0x9b, 0x01, 0x00, 0x00,
+	0x14, 0x86, 0x49, 0x42, 0x84, 0xbe, 0x56, 0x2a, 0x63, 0x85, 0x12, 0x4a, 0x09, 0x59, 0x15, 0xc1,
+	0x0c, 0x56, 0x17, 0xa5, 0xfb, 0x22, 0x6e, 0xac, 0xb4, 0x4b, 0x57, 0x63, 0x1c, 0x63, 0x30, 0x99,
+	0x19, 0x26, 0x2f, 0x89, 0xd9, 0x7a, 0x05, 0x2f, 0xe4, 0x1d, 0xbc, 0x82, 0x07, 0x91, 0x24, 0x23,
+	0x8d, 0xe0, 0x26, 0xe4, 0x7d, 0x7c, 0xfc, 0xff, 0x9b, 0x07, 0xe3, 0x58, 0xab, 0x88, 0x36, 0x9f,
+	0x50, 0x69, 0x89, 0x92, 0xb8, 0x71, 0xa5, 0x55, 0xe4, 0xcd, 0x62, 0x29, 0xe3, 0x94, 0x53, 0xa6,
+	0x12, 0xca, 0x84, 0x90, 0xc8, 0x30, 0x91, 0x22, 0xef, 0xa4, 0xe0, 0xd3, 0x82, 0xd1, 0x9e, 0xeb,
+	0x32, 0x89, 0xf8, 0xad, 0x50, 0x05, 0x12, 0x1f, 0x86, 0x79, 0x37, 0xdf, 0xb1, 0x8c, 0x4f, 0x2d,
+	0xdf, 0x5a, 0x0c, 0x76, 0x7d, 0x44, 0xe6, 0x00, 0x19, 0xc7, 0x17, 0xf9, 0xd4, 0x0a, 0x76, 0x2b,
+	0xf4, 0x08, 0xb9, 0x06, 0x57, 0x31, 0xcd, 0xb2, 0xa9, 0xe3, 0x3b, 0x8b, 0xe1, 0x72, 0x1e, 0xb6,
+	0x7b, 0x84, 0xfd, 0x96, 0xf0, 0xbe, 0x11, 0x36, 0x02, 0x75, 0xbd, 0xeb, 0x64, 0x6f, 0x05, 0x70,
+	0x80, 0xe4, 0x04, 0x9c, 0x57, 0x5e, 0x9b, 0xf6, 0xe6, 0x97, 0x4c, 0xc0, 0x2d, 0x59, 0x5a, 0xfc,
+	0x16, 0x76, 0xc3, 0xda, 0x5e, 0x59, 0xc1, 0x05, 0x1c, 0x9b, 0xec, 0x6d, 0x81, 0xcd, 0x13, 0x66,
+	0x30, 0xd0, 0x3c, 0x2f, 0x52, 0xdc, 0xa3, 0x36, 0x11, 0x07, 0xb0, 0x14, 0x30, 0xde, 0x96, 0x5c,
+	0x3f, 0xa7, 0xb2, 0xba, 0x61, 0xc8, 0x2b, 0x56, 0x93, 0x07, 0x18, 0x6d, 0xde, 0x78, 0x64, 0x52,
+	0x72, 0x72, 0xfa, 0xcf, 0xca, 0xde, 0xe4, 0x2f, 0xec, 0xba, 0x02, 0xff, 0xfd, 0xeb, 0xfb, 0xc3,
+	0xf6, 0x82, 0x33, 0x5a, 0x5e, 0x52, 0x69, 0x72, 0xa9, 0x39, 0x57, 0xbe, 0xb6, 0xce, 0x1f, 0x8f,
+	0xda, 0x43, 0x5f, 0xfd, 0x04, 0x00, 0x00, 0xff, 0xff, 0xfc, 0x33, 0xa2, 0x39, 0xa0, 0x01, 0x00,
+	0x00,
 }
diff --git a/grpc/grpc.pb.gw.go b/grpc/grpc.pb.gw.go
index e1fd310..872adb9 100644
--- a/grpc/grpc.pb.gw.go
+++ b/grpc/grpc.pb.gw.go
@@ -85,18 +85,19 @@ func RegisterOverflowGatewayHandler(ctx context.Context, mux *runtime.ServeMux,
 			}(ctx.Done(), cn.CloseNotify())
 		}
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		rctx, err := runtime.AnnotateContext(ctx,  req)
 		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			runtime.HTTPError(ctx, outboundMarshaler, w, req, err)
+			return
 		}
 		resp, md, err := request_OverflowGateway_ExecServices_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			runtime.HTTPError(ctx, outboundMarshaler, w, req, err)
 			return
 		}
 
-		forward_OverflowGateway_ExecServices_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_OverflowGateway_ExecServices_0(ctx, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})