diff --git a/gopher.go b/gopher.go
index 15d34d1..4a9d1fe 100644
--- a/gopher.go
+++ b/gopher.go
@@ -1,4 +1,4 @@
-// gopher provides an implementation of the Gopher protocol (RFC 1436)
+// Package gopher provides an implementation of the Gopher protocol (RFC 1436)
 //
 // Much of the API is similar in design to the net/http package of the
 // standard library. To build custom Gopher servers implement handler
@@ -10,7 +10,6 @@ package gopher
 import (
 	"bufio"
 	"bytes"
-	"context"
 	"crypto/tls"
 	"encoding/json"
 	"errors"
@@ -27,6 +26,8 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+
+	"golang.org/x/net/context"
 )
 
 // Item Types