diff --git a/examples/auth/client/client.go b/examples/auth/client/client.go
index 30a6e0a..6433311 100644
--- a/examples/auth/client/client.go
+++ b/examples/auth/client/client.go
@@ -8,8 +8,8 @@ import (
 	"log"
 	"time"
 
+	"github.com/awakenetworks/turnpike"
 	"github.com/howeyc/gopass"
-	"gopkg.in/jcelliott/turnpike.v2"
 )
 
 var password []byte
@@ -29,7 +29,11 @@ func main() {
 	turnpike.Debug()
 	fmt.Println("Hint: the password is 'password'")
 	fmt.Print("Password: ")
-	password = gopass.GetPasswd()
+	var err error
+	password, err = gopass.GetPasswd()
+	if err != nil {
+		log.Fatal(err)
+	}
 
 	c, err := turnpike.NewWebsocketClient(turnpike.JSON, "ws://localhost:8000/ws")
 	if err != nil {
diff --git a/examples/auth/server/server.go b/examples/auth/server/server.go
index 877aa4a..7773332 100644
--- a/examples/auth/server/server.go
+++ b/examples/auth/server/server.go
@@ -8,8 +8,8 @@ import (
 	"log"
 	"net/http"
 
+	"github.com/awakenetworks/turnpike"
 	"github.com/satori/go.uuid"
-	"gopkg.in/jcelliott/turnpike.v2"
 )
 
 // this is just an example, please don't actually use it
diff --git a/examples/autobahn/server/main.go b/examples/autobahn/server/main.go
index 8f9c40b..a9586b7 100644
--- a/examples/autobahn/server/main.go
+++ b/examples/autobahn/server/main.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"net/http"
 
-	"gopkg.in/jcelliott/turnpike.v2"
+	"github.com/awakenetworks/turnpike"
 )
 
 func main() {
diff --git a/examples/chat/chatclient/main.go b/examples/chat/chatclient/main.go
index 1395f35..e547936 100644
--- a/examples/chat/chatclient/main.go
+++ b/examples/chat/chatclient/main.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"os"
 
-	"gopkg.in/jcelliott/turnpike.v2"
+	"github.com/awakenetworks/turnpike"
 )
 
 const (
diff --git a/examples/chat/chatserver/main.go b/examples/chat/chatserver/main.go
index 8f9c40b..a9586b7 100644
--- a/examples/chat/chatserver/main.go
+++ b/examples/chat/chatserver/main.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"net/http"
 
-	"gopkg.in/jcelliott/turnpike.v2"
+	"github.com/awakenetworks/turnpike"
 )
 
 func main() {
diff --git a/examples/meta-api/meta-client.go b/examples/meta-api/meta-client.go
index bdd8310..34dc5ee 100644
--- a/examples/meta-api/meta-client.go
+++ b/examples/meta-api/meta-client.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"gopkg.in/jcelliott/turnpike.v2"
+	"github.com/awakenetworks/turnpike"
 )
 
 func main() {
diff --git a/examples/rpc/rpc-client/main.go b/examples/rpc/rpc-client/main.go
index ff3516c..e1bff2d 100644
--- a/examples/rpc/rpc-client/main.go
+++ b/examples/rpc/rpc-client/main.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strconv"
 
-	"gopkg.in/jcelliott/turnpike.v2"
+	"github.com/awakenetworks/turnpike"
 )
 
 func main() {
diff --git a/examples/rpc/rpc-server/main.go b/examples/rpc/rpc-server/main.go
index ff428b7..6ab2f72 100644
--- a/examples/rpc/rpc-server/main.go
+++ b/examples/rpc/rpc-server/main.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"gopkg.in/jcelliott/turnpike.v2"
+	"github.com/awakenetworks/turnpike"
 )
 
 var client *turnpike.Client
diff --git a/examples/web/server.go b/examples/web/server.go
index 0a92017..af073c1 100644
--- a/examples/web/server.go
+++ b/examples/web/server.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"net/http"
 
-	"gopkg.in/jcelliott/turnpike.v2"
+	"github.com/awakenetworks/turnpike"
 )
 
 func main() {
diff --git a/websocket.go b/websocket.go
index b34d908..cc363af 100644
--- a/websocket.go
+++ b/websocket.go
@@ -2,6 +2,7 @@ package turnpike
 
 import (
 	"fmt"
+	"sync"
 	"time"
 
 	"github.com/gorilla/websocket"
@@ -13,6 +14,7 @@ type websocketPeer struct {
 	messages    chan Message
 	payloadType int
 	closed      bool
+	writeMutex  sync.Mutex
 }
 
 // NewWebsocketPeer connects to the websocket server at the specified url.
@@ -56,6 +58,8 @@ func (ep *websocketPeer) Send(msg Message) error {
 	if err != nil {
 		return err
 	}
+	ep.writeMutex.Lock()
+	defer ep.writeMutex.Unlock()
 	return ep.conn.WriteMessage(ep.payloadType, b)
 }
 func (ep *websocketPeer) Receive() <-chan Message {