diff --git a/Makefile b/Makefile
index 76182b5..f16456a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.2.0
+VERSION=0.2.1
 
 all: deps fmt combined
 
diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index 0817a25..d39172c 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -1,6 +1,21 @@
 MailHog Releases
 ================
 
+### [v0.2.1](https://github.com/mailhog/MailHog/releases/v0.2.1)
+- Update .travis.yml to Go 1.6 and tip
+- Fix builds broken by out of date mgo import path
+- #82 - fix configuration documentation, thanks @riking
+- #83 - add search query parameter to Swagger JSON, thanks @kkrauth
+- #86 - vendor all dependencies
+- #89 - add missing iso88591_map.js and sjis_map.js
+- #90 - update broken link in documentation, thanks @espen
+- #91 - add assets/js/filesize-3.1.2.min.js
+- #93 - starting MailHog as a service using brew, thanks @espen
+- #95 - fix UTF-8 encoding bug in attachment names
+- #97 - fix header case sensitivity bug
+- #102 - merge multiple PRs adding WebSocket support, thanks @GREsau
+- mailhog/smtp#2 - use file modification time for Created field, thanks @esiqveland
+
 ### [v0.2.0](https://github.com/mailhog/MailHog/releases/v0.2.0)
 - mailhog/storage#1 - fix MongoDB storage bug, and implement search, thanks @HokieTT
 - #13 - implement file based storage backend (currently without search)
diff --git a/vendor/github.com/mailhog/storage/mongodb.go b/vendor/github.com/mailhog/storage/mongodb.go
index 6e506fa..788e268 100644
--- a/vendor/github.com/mailhog/storage/mongodb.go
+++ b/vendor/github.com/mailhog/storage/mongodb.go
@@ -1,10 +1,10 @@
 package storage
 
 import (
-	"log"
 	"github.com/mailhog/data"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
+	"log"
 )
 
 // MongoDB represents MongoDB backed storage backend
@@ -54,10 +54,10 @@ func (mongo *MongoDB) Search(kind, query string, start, limit int) (*data.Messag
 	var count = 0
 	var field = "raw.data"
 	switch kind {
-		case "to":
-			field = "raw.to"
-		case "from":
-			field = "raw.from"
+	case "to":
+		field = "raw.to"
+	case "from":
+		field = "raw.from"
 	}
 	err := mongo.Collection.Find(bson.M{field: bson.RegEx{Pattern: query, Options: "i"}}).Skip(start).Limit(limit).Sort("-created").Select(bson.M{
 		"id":              1,
diff --git a/vendor/gopkg.in/mgo.v2/bson/bson.go b/vendor/gopkg.in/mgo.v2/bson/bson.go
index 7fb7f8c..61e2605 100644
--- a/vendor/gopkg.in/mgo.v2/bson/bson.go
+++ b/vendor/gopkg.in/mgo.v2/bson/bson.go
@@ -279,7 +279,7 @@ var nullBytes = []byte("null")
 func (id *ObjectId) UnmarshalJSON(data []byte) error {
 	if len(data) > 0 && (data[0] == '{' || data[0] == 'O') {
 		var v struct {
-			Id json.RawMessage `json:"$oid"`
+			Id   json.RawMessage `json:"$oid"`
 			Func struct {
 				Id json.RawMessage
 			} `json:"$oidFunc"`
diff --git a/vendor/gopkg.in/mgo.v2/internal/json/decode.go b/vendor/gopkg.in/mgo.v2/internal/json/decode.go
index ce7c7d2..d2ba510 100644
--- a/vendor/gopkg.in/mgo.v2/internal/json/decode.go
+++ b/vendor/gopkg.in/mgo.v2/internal/json/decode.go
@@ -773,7 +773,7 @@ func (d *decodeState) isNull(off int) bool {
 // name consumes a const or function from d.data[d.off-1:], decoding into the value v.
 // the first byte of the function name has been read already.
 func (d *decodeState) name(v reflect.Value) {
-	if d.isNull(d.off-1) {
+	if d.isNull(d.off - 1) {
 		d.literal(v)
 		return
 	}
@@ -1076,9 +1076,9 @@ func (d *decodeState) storeKeyed(v reflect.Value) bool {
 }
 
 var (
-	trueBytes = []byte("true")
+	trueBytes  = []byte("true")
 	falseBytes = []byte("false")
-	nullBytes = []byte("null")
+	nullBytes  = []byte("null")
 )
 
 func (d *decodeState) storeValue(v reflect.Value, from interface{}) {
diff --git a/vendor/gopkg.in/mgo.v2/internal/scram/scram.go b/vendor/gopkg.in/mgo.v2/internal/scram/scram.go
index 80cda91..2deb2c7 100644
--- a/vendor/gopkg.in/mgo.v2/internal/scram/scram.go
+++ b/vendor/gopkg.in/mgo.v2/internal/scram/scram.go
@@ -133,7 +133,7 @@ func (c *Client) Step(in []byte) bool {
 func (c *Client) step1(in []byte) error {
 	if len(c.clientNonce) == 0 {
 		const nonceLen = 6
-		buf := make([]byte, nonceLen + b64.EncodedLen(nonceLen))
+		buf := make([]byte, nonceLen+b64.EncodedLen(nonceLen))
 		if _, err := rand.Read(buf[:nonceLen]); err != nil {
 			return fmt.Errorf("cannot read random SCRAM-SHA-1 nonce from operating system: %v", err)
 		}