diff --git a/Makefile b/Makefile
index 30d599d..db1cc2d 100755
--- a/Makefile
+++ b/Makefile
@@ -61,10 +61,10 @@ protoc:
 		make protoc-install; \
 	fi
 	# Protoc generate
-	@for f in `find . -type f -name '*.proto'`; do \
+	@for f in `find . -type f -name '*.proto'  -not -path './bin/*'`; do \
 		echo "⇒ Processing $$f "; \
 		$(PROTOC_DIR)/bin/protoc \
-			--proto_path=.:/usr/local/include \
+			--proto_path=.:$(PROTOC_DIR)/include:/usr/local/include \
 			--plugin=protoc-gen-go=$(PROTOC_GEN_GO_DIR)/protoc-gen-go \
 			--go_out=. --go_opt=paths=source_relative \
 			--go-grpc_opt=require_unimplemented_servers=false \
diff --git a/prepare.sh b/prepare.sh
index 4b8b125..1d00954 100755
--- a/prepare.sh
+++ b/prepare.sh
@@ -10,7 +10,7 @@ API_PATH=$1
 
 # MOVE FILES FROM API REPO
 cd "$API_PATH" || exit 1
-ARGS=$(find ./ -name '*.proto')
+ARGS=$(find ./ -name '*.proto' -not -path './bin/*')
 for file in $ARGS; do
 	dir=$(dirname "$file")
 	mkdir -p "$API_GO_PATH/$dir/grpc"
@@ -19,7 +19,7 @@ done
 
 # MODIFY FILES
 cd "$API_GO_PATH" || exit 1
-ARGS2=$(find ./ -name '*.proto')
+ARGS2=$(find ./ -name '*.proto' -not -path './bin/*')
 for file in $ARGS2; do
 	echo "$file"
 	sed -i "s/import\ \"\(.*\)\/\(.*\)\.proto\";/import\ \"\1\/grpc\/\2\.proto\";/" $file
@@ -30,7 +30,7 @@ cd "$API_GO_PATH" || exit 1
 make protoc
 
 # REMOVE PROTO DEFINITIONS
-ARGS=$(find ./$prefix -name '*.proto' -not -path './util/*')
+ARGS=$(find ./$prefix -name '*.proto' -not -path './util/*'  -not -path './bin/*')
 for file in $ARGS; do
 	rm "$file"
 done