diff --git a/README.md b/README.md
index 1f53508..c62a466 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,17 @@ Go was chosen for portability - MailHog runs without installation on multiple pl
 By default, the SMTP server will start on port 1025, and the HTTP
 server will start on port 8025.
 
+### Features
+
+* ESMTP server implementing RFC5321
+* Web interface to view messages
+* API interface to list, retrieve and delete messages
+* MongoDB storage for message persistence
+* Lightweight and portable
+* No installation required
+
+![Screenshot of MailHog web interface](/images/MailHog.png "MailHog web interface")
+
 ### Configuration
 
 You can configure Go-MailHog using command line options:
diff --git a/images/MailHog.png b/images/MailHog.png
new file mode 100644
index 0000000..922a0df
Binary files /dev/null and b/images/MailHog.png differ
diff --git a/mailhog/data/message.go b/mailhog/data/message.go
index 02197cf..1803181 100644
--- a/mailhog/data/message.go
+++ b/mailhog/data/message.go
@@ -63,11 +63,7 @@ func ParseSMTPMessage(c *mailhog.Config, m *SMTPMessage) *Message {
 }
 
 func (content *Content) IsMIME() bool {
-	if strings.HasPrefix(content.Headers["Content-Type"][0], "multipart/") {
-		return true
-	} else {
-		return false
-	}
+	return strings.HasPrefix(content.Headers["Content-Type"][0], "multipart/")
 }
 
 func (content *Content) ParseMIMEBody() *MIMEBody {