diff --git a/Makefile b/Makefile
index 15ea940..1c6913e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,22 @@
 default: debug
 
 debug:
-	go install -ldflags "-w" github.com/dimiro1/ipe
+	GO15VENDOREXPERIMENT=1 go install -ldflags "-w" github.com/dimiro1/ipe
 
 run-debug: debug
 	${GOPATH}/bin/ipe --config ${GOPATH}/src/github.com/dimiro1/ipe/config.json -logtostderr=true -v=2
 
 test:
-	go test `go list ./... | grep -v vendor`
+	GO15VENDOREXPERIMENT=1 go test `go list ./... | grep -v vendor`
 
 macos:
-	GOOS=darwin GOARCH=amd64 go install github.com/dimiro1/ipe
+	GO15VENDOREXPERIMENT=1 GOOS=darwin GOARCH=amd64 go install github.com/dimiro1/ipe
 
 linux:
-	GOOS=linux GOARCH=amd64 go install github.com/dimiro1/ipe
+	GO15VENDOREXPERIMENT=1 GOOS=linux GOARCH=amd64 go install github.com/dimiro1/ipe
 
 windows:
-	GOOS=windows GOARCH=amd64 go install github.com/dimiro1/ipe
+	GO15VENDOREXPERIMENT=1 GOOS=windows GOARCH=amd64 go install github.com/dimiro1/ipe
 
 raspberry:
-	GOOS=linux GOARCH=arm go install github.com/dimiro1/ipe
+	GO15VENDOREXPERIMENT=1 GOOS=linux GOARCH=arm go install github.com/dimiro1/ipe
diff --git a/ipe/app.go b/ipe/app.go
index 12caf6b..ffe2913 100644
--- a/ipe/app.go
+++ b/ipe/app.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"sync"
 
-	log "github.com/dimiro1/ipe/vendor/github.com/golang/glog"
+	log "github.com/golang/glog"
 )
 
 // An App
diff --git a/ipe/auth.go b/ipe/auth.go
index a0d2b95..66094e3 100644
--- a/ipe/auth.go
+++ b/ipe/auth.go
@@ -10,8 +10,8 @@ import (
 	"sort"
 	"strings"
 
-	log "github.com/dimiro1/ipe/vendor/github.com/golang/glog"
-	"github.com/dimiro1/ipe/vendor/github.com/gorilla/mux"
+	log "github.com/golang/glog"
+	"github.com/gorilla/mux"
 
 	"github.com/dimiro1/ipe/utils"
 )
diff --git a/ipe/channel.go b/ipe/channel.go
index 85c3662..0309da9 100644
--- a/ipe/channel.go
+++ b/ipe/channel.go
@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/dimiro1/ipe/vendor/github.com/golang/glog"
+	log "github.com/golang/glog"
 )
 
 // A Channel
diff --git a/ipe/connection.go b/ipe/connection.go
index d0ef834..01a03b0 100644
--- a/ipe/connection.go
+++ b/ipe/connection.go
@@ -7,8 +7,8 @@ package ipe
 import (
 	"time"
 
-	log "github.com/dimiro1/ipe/vendor/github.com/golang/glog"
-	"github.com/dimiro1/ipe/vendor/github.com/gorilla/websocket"
+	log "github.com/golang/glog"
+	"github.com/gorilla/websocket"
 )
 
 // An User Connection
diff --git a/ipe/events.go b/ipe/events.go
index 64df422..5148820 100644
--- a/ipe/events.go
+++ b/ipe/events.go
@@ -7,7 +7,7 @@ package ipe
 import (
 	"encoding/json"
 
-	log "github.com/dimiro1/ipe/vendor/github.com/golang/glog"
+	log "github.com/golang/glog"
 )
 
 // {
diff --git a/ipe/extra_handlers.go b/ipe/extra_handlers.go
index b3e2ac3..4bf1b5c 100644
--- a/ipe/extra_handlers.go
+++ b/ipe/extra_handlers.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/dimiro1/ipe/vendor/github.com/gorilla/mux"
+	"github.com/gorilla/mux"
 )
 
 // Check if the application is disabled
diff --git a/ipe/rest.go b/ipe/rest.go
index 359b00d..80f59e3 100644
--- a/ipe/rest.go
+++ b/ipe/rest.go
@@ -10,8 +10,8 @@ import (
 	"net/http"
 	"strings"
 
-	log "github.com/dimiro1/ipe/vendor/github.com/golang/glog"
-	"github.com/dimiro1/ipe/vendor/github.com/gorilla/mux"
+	log "github.com/golang/glog"
+	"github.com/gorilla/mux"
 )
 
 // An event consists of a name and data (typically JSON) which may be sent to all subscribers to a particular channel or channels.
diff --git a/ipe/router.go b/ipe/router.go
index fda46e1..42f387a 100644
--- a/ipe/router.go
+++ b/ipe/router.go
@@ -8,7 +8,7 @@ import (
 	_ "expvar"
 	"net/http"
 
-	"github.com/dimiro1/ipe/vendor/github.com/gorilla/mux"
+	"github.com/gorilla/mux"
 )
 
 // newRouter is a function that returns a new configured Router
diff --git a/ipe/webhooks.go b/ipe/webhooks.go
index 1e8585a..9cf4fc5 100644
--- a/ipe/webhooks.go
+++ b/ipe/webhooks.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/dimiro1/ipe/utils"
-	log "github.com/dimiro1/ipe/vendor/github.com/golang/glog"
+	log "github.com/golang/glog"
 )
 
 // A WebHook is sent as a HTTP POST request to the url which you specify.
diff --git a/ipe/websockets.go b/ipe/websockets.go
index 2b2e63d..c439654 100644
--- a/ipe/websockets.go
+++ b/ipe/websockets.go
@@ -12,9 +12,9 @@ import (
 	"strconv"
 	"strings"
 
-	log "github.com/dimiro1/ipe/vendor/github.com/golang/glog"
-	"github.com/dimiro1/ipe/vendor/github.com/gorilla/mux"
-	"github.com/dimiro1/ipe/vendor/github.com/gorilla/websocket"
+	log "github.com/golang/glog"
+	"github.com/gorilla/mux"
+	"github.com/gorilla/websocket"
 
 	"github.com/dimiro1/ipe/utils"
 )
diff --git a/main.go b/main.go
index 038aed5..0fc872b 100644
--- a/main.go
+++ b/main.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 
 	"github.com/dimiro1/ipe/ipe"
-	log "github.com/dimiro1/ipe/vendor/github.com/golang/glog"
+	log "github.com/golang/glog"
 )
 
 // Main function, initialze the system