diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae52f830a..f9dcb6261 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 3.0.2 (unreleased)
+* [NEW] Support for auto-substituting `ValueTask<T>` results. Thanks to
+@KrzysztofBranicki for this change. (#325)
+
 ### 3.0.1 (October 2017)
 * [FIX] Signing 3.x release to prevent problems with other packages that work
 with different versions of NSubstitute. Thanks Alex Povar for raising this. (#324)
diff --git a/src/NSubstitute/NSubstitute.csproj b/src/NSubstitute/NSubstitute.csproj
index bbd1b805b..52218f672 100644
--- a/src/NSubstitute/NSubstitute.csproj
+++ b/src/NSubstitute/NSubstitute.csproj
@@ -32,8 +32,8 @@
   <ItemGroup>
     <PackageReference Include="Castle.Core" Version="4.2.0-*" />
     <PackageReference Include="System.Linq.Queryable" Version="4.3.0-*" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.4.0" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0-*" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0-*" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NSubstitute/SubstituteExtensions.cs b/src/NSubstitute/SubstituteExtensions.cs
index c38a11f0c..2b69f602d 100644
--- a/src/NSubstitute/SubstituteExtensions.cs
+++ b/src/NSubstitute/SubstituteExtensions.cs
@@ -42,7 +42,7 @@ public static ConfiguredCall Returns<T>(this T value, Func<CallInfo, T> returnTh
         /// <typeparam name="T"></typeparam>
         /// <param name="value"></param>
         /// <param name="returnThis">Value to return. Will be wrapped in a Task</param>
-        /// <param name="returnThese">Optionally use these functions next</param>
+        /// <param name="returnThese">Optionally use these values next</param>
         /// <returns></returns>
         public static ConfiguredCall Returns<T>(this Task<T> value, T returnThis, params T[] returnThese)
         {
@@ -75,7 +75,7 @@ public static ConfiguredCall Returns<T>(this Task<T> value, Func<CallInfo, T> re
         /// <typeparam name="T"></typeparam>
         /// <param name="value"></param>
         /// <param name="returnThis">Value to return. Will be wrapped in a ValueTask</param>
-        /// <param name="returnThese">Optionally use these functions next</param>
+        /// <param name="returnThese">Optionally use these values next</param>
         /// <returns></returns>
         public static ConfiguredCall Returns<T>(this ValueTask<T> value, T returnThis, params T[] returnThese)
         {