diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8ac97b..57b2ca1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release. 
 
+## 2.3.2
+
+### Fixed
+
+- When parsing an address in `MessageBuilder` we surround the recipient name with double quotes instead of single quotes.   
+
+## 2.3.1
+
+### Fixed
+
+- Make sure to reset the `MultipartStreamBuilder` after a stream is built.
+
 ## 2.3.0
 
 ### Added
diff --git a/src/Mailgun/Connection/RestClient.php b/src/Mailgun/Connection/RestClient.php
index 31c7b8b..b9533f9 100644
--- a/src/Mailgun/Connection/RestClient.php
+++ b/src/Mailgun/Connection/RestClient.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*
  * Copyright (C) 2013-2016 Mailgun
diff --git a/src/Mailgun/Lists/OptInHandler.php b/src/Mailgun/Lists/OptInHandler.php
index efe0cb0..a263563 100644
--- a/src/Mailgun/Lists/OptInHandler.php
+++ b/src/Mailgun/Lists/OptInHandler.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*
  * Copyright (C) 2013-2016 Mailgun
diff --git a/src/Mailgun/Mailgun.php b/src/Mailgun/Mailgun.php
index 7dc3e37..a81ae2d 100644
--- a/src/Mailgun/Mailgun.php
+++ b/src/Mailgun/Mailgun.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*
  * Copyright (C) 2013-2016 Mailgun
@@ -70,7 +70,7 @@ class Mailgun
      *
      * @internal Use Mailgun::configure or Mailgun::create instead.
      */
-    public /* private */ function __construct(
+    public function __construct(
         $apiKey = null, /* Deprecated, will be removed in 3.0 */
         HttpClient $httpClient = null,
         $apiEndpoint = 'api.mailgun.net', /* Deprecated, will be removed in 3.0 */
diff --git a/src/Mailgun/Messages/BatchMessage.php b/src/Mailgun/Messages/BatchMessage.php
index 2df95c3..36de030 100644
--- a/src/Mailgun/Messages/BatchMessage.php
+++ b/src/Mailgun/Messages/BatchMessage.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*
  * Copyright (C) 2013-2016 Mailgun
diff --git a/src/Mailgun/Messages/MessageBuilder.php b/src/Mailgun/Messages/MessageBuilder.php
index ca7714c..67aea07 100644
--- a/src/Mailgun/Messages/MessageBuilder.php
+++ b/src/Mailgun/Messages/MessageBuilder.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*
  * Copyright (C) 2013-2016 Mailgun
diff --git a/tests/Lists/OptInHandlerTest.php b/tests/Lists/OptInHandlerTest.php
index 57f3558..f4cd433 100644
--- a/tests/Lists/OptInHandlerTest.php
+++ b/tests/Lists/OptInHandlerTest.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*
  * Copyright (C) 2013-2016 Mailgun
diff --git a/tests/MailgunTest.php b/tests/MailgunTest.php
index adc30fd..0fb0fdb 100644
--- a/tests/MailgunTest.php
+++ b/tests/MailgunTest.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*
  * Copyright (C) 2013-2016 Mailgun
diff --git a/tests/MailgunTestCase.php b/tests/MailgunTestCase.php
index e88c82a..1a1bd63 100644
--- a/tests/MailgunTestCase.php
+++ b/tests/MailgunTestCase.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*
  * Copyright (C) 2013-2016 Mailgun
diff --git a/tests/Messages/BatchMessageTest.php b/tests/Messages/BatchMessageTest.php
index 7edf6b2..9355deb 100644
--- a/tests/Messages/BatchMessageTest.php
+++ b/tests/Messages/BatchMessageTest.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*
  * Copyright (C) 2013-2016 Mailgun
diff --git a/tests/Messages/ComplexMessageTest.php b/tests/Messages/ComplexMessageTest.php
index 3fdedac..7dc7560 100644
--- a/tests/Messages/ComplexMessageTest.php
+++ b/tests/Messages/ComplexMessageTest.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*
  * Copyright (C) 2013-2016 Mailgun
diff --git a/tests/Messages/MessageBuilderTest.php b/tests/Messages/MessageBuilderTest.php
index cd058ed..46c8c39 100644
--- a/tests/Messages/MessageBuilderTest.php
+++ b/tests/Messages/MessageBuilderTest.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*
  * Copyright (C) 2013-2016 Mailgun
diff --git a/tests/Messages/StandardMessageTest.php b/tests/Messages/StandardMessageTest.php
index aa4070c..e818882 100644
--- a/tests/Messages/StandardMessageTest.php
+++ b/tests/Messages/StandardMessageTest.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*
  * Copyright (C) 2013-2016 Mailgun
diff --git a/tests/Mock/Mailgun.php b/tests/Mock/Mailgun.php
index cbe7d80..c50f417 100644
--- a/tests/Mock/Mailgun.php
+++ b/tests/Mock/Mailgun.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*
  * Copyright (C) 2013-2016 Mailgun