diff --git a/Build/MQTTnet.nuspec b/Build/MQTTnet.nuspec
index 4fb8719b5..30bf138d6 100644
--- a/Build/MQTTnet.nuspec
+++ b/Build/MQTTnet.nuspec
@@ -10,11 +10,12 @@
     <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker).</description>
-    <releaseNotes> * [Client] Added new overloads for the message builder.
+    <releaseNotes> * [Client] Added new overloads for the message builders.
 * [Core] Performance optimizations (thanks to @	israellot)
 * [Core] Fixed a memory leak which was caused by not properly stopped async tasks.
 * [Client] Fixed a deadlock when connecting to a not reachable server.
-* [Server] Fixed a deadlock when reusing the same _ClientId_ while a will message is used (thanks to @william-wps).
+* [Server] Fixed a deadlock when reusing the same _ClientId_ while a _will message_ is used (thanks to @william-wps).
+* [Server] Fixed wrong topic filter matching for filters like 'sport/+' which should _not_ match 'sport'.
     </releaseNotes>
     <copyright>Copyright Christian Kratky 2016-2018</copyright>
     <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin</tags> 
diff --git a/README.md b/README.md
index 409cbae23..cff5490fd 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ If you use this library and want to see your project here please let me know.
 
 ## MIT License
 
-Copyright (c) 2017 Christian Kratky
+Copyright (c) 2017-2018 Christian Kratky
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Tests/MQTTnet.Core.Tests/MqttServerTests.cs b/Tests/MQTTnet.Core.Tests/MqttServerTests.cs
index dc2f52512..399e71ed5 100644
--- a/Tests/MQTTnet.Core.Tests/MqttServerTests.cs
+++ b/Tests/MQTTnet.Core.Tests/MqttServerTests.cs
@@ -244,8 +244,9 @@ public async Task MqttServer_ClearRetainedMessage()
                 
                 var c2 = await serverAdapter.ConnectTestClient(s, "c2");
                 c2.ApplicationMessageReceived += (_, __) => receivedMessagesCount++;
+                
+                await Task.Delay(200);
                 await c2.SubscribeAsync(new TopicFilter("retained", MqttQualityOfServiceLevel.AtMostOnce));
-
                 await Task.Delay(500);
             }
             finally