diff --git a/src/X.PagedList/BasePagedList.cs b/src/X.PagedList/BasePagedList.cs
index 747d9b0e..ef369162 100644
--- a/src/X.PagedList/BasePagedList.cs
+++ b/src/X.PagedList/BasePagedList.cs
@@ -1,18 +1,22 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using JetBrains.Annotations;
 
 namespace X.PagedList
 {
     /// <summary>
-    /// Represents a subset of a collection of objects that can be individually accessed by index and containing metadata about the superset collection of objects this subset was created from.
+    /// Represents a subset of a collection of objects that can be individually accessed by index and containing
+    /// metadata about the superset collection of objects this subset was created from.
     /// </summary>
     /// <remarks>
-    /// Represents a subset of a collection of objects that can be individually accessed by index and containing metadata about the superset collection of objects this subset was created from.
+    /// Represents a subset of a collection of objects that can be individually accessed by index and containing
+    /// metadata about the superset collection of objects this subset was created from.
     /// </remarks>
     /// <typeparam name = "T">The type of object the collection should contain.</typeparam>
     /// <seealso cref = "IPagedList{T}" />
     /// <seealso cref = "List{T}" />
+    [PublicAPI]
     public abstract class BasePagedList<T> : PagedListMetaData, IPagedList<T>
     {
         protected readonly List<T> Subset = new List<T>();
@@ -25,7 +29,8 @@ protected internal BasePagedList()
         }
 
         /// <summary>
-        /// Initializes a new instance of a type deriving from <see cref = "BasePagedList{T}" /> and sets properties needed to calculate position and size data on the subset and superset.
+        /// Initializes a new instance of a type deriving from <see cref = "BasePagedList{T}" /> and sets properties
+        /// needed to calculate position and size data on the subset and superset.
         /// </summary>
         /// <param name = "pageNumber">The one-based index of the subset of objects contained by this instance.</param>
         /// <param name = "pageSize">The maximum size of any individual subset.</param>
@@ -56,7 +61,7 @@ protected internal BasePagedList(int pageNumber, int pageSize, int totalItemCoun
                             ? (int)Math.Ceiling(TotalItemCount / (double)PageSize)
                             : 0;
 
-            bool pageNumberIsGood = PageCount > 0 && PageNumber <= PageCount;
+            var pageNumberIsGood = PageCount > 0 && PageNumber <= PageCount;
 
             HasPreviousPage = pageNumberIsGood && PageNumber > 1;
             HasNextPage = pageNumberIsGood && PageNumber < PageCount;
diff --git a/src/X.PagedList/IPagedList.cs b/src/X.PagedList/IPagedList.cs
index ac46fea2..e77479f6 100644
--- a/src/X.PagedList/IPagedList.cs
+++ b/src/X.PagedList/IPagedList.cs
@@ -1,121 +1,128 @@
 using System.Collections.Generic;
+using JetBrains.Annotations;
 
 namespace X.PagedList
 {
-	/// <summary>
-	/// Represents a subset of a collection of objects that can be individually accessed by index and containing metadata about the superset collection of objects this subset was created from.
-	/// </summary>
-	/// <remarks>
-	/// Represents a subset of a collection of objects that can be individually accessed by index and containing metadata about the superset collection of objects this subset was created from.
-	/// </remarks>
-	/// <typeparam name="T">The type of object the collection should contain.</typeparam>
-	/// <seealso cref="IEnumerable{T}"/>
-	public interface IPagedList<out T> : IPagedList, IReadOnlyList<T>, IEnumerable<T>
-	{
-		///<summary>
-		/// Gets the element at the specified index.
-		///</summary>
-		///<param name="index">The zero-based index of the element to get.</param>
-		T this[int index] { get; }
-
-		///<summary>
-		/// Gets the number of elements contained on this page.
-		///</summary>
-		int Count { get; }
-
+    /// <summary>
+    /// Represents a subset of a collection of objects that can be individually accessed by index and containing
+    /// metadata about the superset collection of objects this subset was created from.
+    /// </summary>
+    /// <remarks>
+    /// Represents a subset of a collection of objects that can be individually accessed by index and containing
+    /// metadata about the superset collection of objects this subset was created from.
+    /// </remarks>
+    /// <typeparam name="T">The type of object the collection should contain.</typeparam>
+    /// <seealso cref="IEnumerable{T}"/>
+    [PublicAPI]
+    public interface IPagedList<out T> : IPagedList, IReadOnlyList<T>
+    {
         ///<summary>
         /// Gets a non-enumerable copy of this paged list.
         ///</summary>
         ///<returns>A non-enumerable copy of this paged list.</returns>
         PagedListMetaData GetMetaData();
-	}
+    }
 
-	/// <summary>
-	/// Represents a subset of a collection of objects that can be individually accessed by index and containing metadata about the superset collection of objects this subset was created from.
-	/// </summary>
-	/// <remarks>
-	/// Represents a subset of a collection of objects that can be individually accessed by index and containing metadata about the superset collection of objects this subset was created from.
-	/// </remarks>
-	public interface IPagedList
-	{
-		/// <summary>
-		/// Total number of subsets within the superset.
-		/// </summary>
-		/// <value>
-		/// Total number of subsets within the superset.
-		/// </value>
-		int PageCount { get; }
+    /// <summary>
+    /// Represents a subset of a collection of objects that can be individually accessed by index and containing
+    /// metadata about the superset collection of objects this subset was created from.
+    /// </summary>
+    /// <remarks>
+    /// Represents a subset of a collection of objects that can be individually accessed by index and containing
+    /// metadata about the superset collection of objects this subset was created from.
+    /// </remarks>
+    public interface IPagedList
+    {
+        /// <summary>
+        /// Total number of subsets within the superset.
+        /// </summary>
+        /// <value>
+        /// Total number of subsets within the superset.
+        /// </value>
+        int PageCount { get; }
 
-		/// <summary>
-		/// Total number of objects contained within the superset.
-		/// </summary>
-		/// <value>
-		/// Total number of objects contained within the superset.
-		/// </value>
-		int TotalItemCount { get; }
+        /// <summary>
+        /// Total number of objects contained within the superset.
+        /// </summary>
+        /// <value>
+        /// Total number of objects contained within the superset.
+        /// </value>
+        int TotalItemCount { get; }
 
-		/// <summary>
-		/// One-based index of this subset within the superset, zero if the superset is empty.
-		/// </summary>
-		/// <value>
-		/// One-based index of this subset within the superset, zero if the superset is empty.
-		/// </value>
-		int PageNumber { get; }
+        /// <summary>
+        /// One-based index of this subset within the superset, zero if the superset is empty.
+        /// </summary>
+        /// <value>
+        /// One-based index of this subset within the superset, zero if the superset is empty.
+        /// </value>
+        int PageNumber { get; }
 
-		/// <summary>
-		/// Maximum size any individual subset.
-		/// </summary>
-		/// <value>
-		/// Maximum size any individual subset.
-		/// </value>
-		int PageSize { get; }
+        /// <summary>
+        /// Maximum size any individual subset.
+        /// </summary>
+        /// <value>
+        /// Maximum size any individual subset.
+        /// </value>
+        int PageSize { get; }
 
-		/// <summary>
-		/// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is NOT the first subset within the superset.
-		/// </summary>
-		/// <value>
-		/// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is NOT the first subset within the superset.
-		/// </value>
-		bool HasPreviousPage { get; }
+        /// <summary>
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+        /// is NOT the first subset within the superset.
+        /// </summary>
+        /// <value>
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+        /// is NOT the first subset within the superset.
+        /// </value>
+        bool HasPreviousPage { get; }
 
-		/// <summary>
-		/// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is NOT the last subset within the superset.
-		/// </summary>
-		/// <value>
-		/// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is NOT the last subset within the superset.
-		/// </value>
-		bool HasNextPage { get; }
+        /// <summary>
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+        /// is NOT the last subset within the superset.
+        /// </summary>
+        /// <value>
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+        /// is NOT the last subset within the superset.
+        /// </value>
+        bool HasNextPage { get; }
 
-		/// <summary>
-		/// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is the first subset within the superset.
-		/// </summary>
-		/// <value>
-		/// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is the first subset within the superset.
-		/// </value>
-		bool IsFirstPage { get; }
+        /// <summary>
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+        /// is the first subset within the superset.
+        /// </summary>
+        /// <value>
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+        /// is the first subset within the superset.
+        /// </value>
+        bool IsFirstPage { get; }
 
-		/// <summary>
-		/// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is the last subset within the superset.
-		/// </summary>
-		/// <value>
-		/// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is the last subset within the superset.
-		/// </value>
-		bool IsLastPage { get; }
+        /// <summary>
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+        /// is the last subset within the superset.
+        /// </summary>
+        /// <value>
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+        /// is the last subset within the superset.
+        /// </value>
+        bool IsLastPage { get; }
 
-		/// <summary>
-		/// One-based index of the first item in the paged subset, zero if the superset is empty or PageNumber is greater than PageCount.
-		/// </summary>
-		/// <value>
-		/// One-based index of the first item in the paged subset, zero if the superset is empty or PageNumber is greater than PageCount.
-		/// </value>
-		int FirstItemOnPage { get; }
+        /// <summary>
+        /// One-based index of the first item in the paged subset, zero if the superset is empty or PageNumber
+        /// is greater than PageCount.
+        /// </summary>
+        /// <value>
+        /// One-based index of the first item in the paged subset, zero if the superset is empty or PageNumber
+        /// is greater than PageCount.
+        /// </value>
+        int FirstItemOnPage { get; }
 
-		/// <summary>
-		/// One-based index of the last item in the paged subset, zero if the superset is empty or PageNumber is greater than PageCount.
-		/// </summary>
-		/// <value>
-		/// One-based index of the last item in the paged subset, zero if the superset is empty or PageNumber is greater than PageCount.
-		/// </value>
-		int LastItemOnPage { get; }
-	}
+        /// <summary>
+        /// One-based index of the last item in the paged subset, zero if the superset is empty or PageNumber
+        /// is greater than PageCount.
+        /// </summary>
+        /// <value>
+        /// One-based index of the last item in the paged subset, zero if the superset is empty or PageNumber
+        /// is greater than PageCount.
+        /// </value>
+        int LastItemOnPage { get; }
+    }
 }
\ No newline at end of file
diff --git a/src/X.PagedList/PagedList.cs b/src/X.PagedList/PagedList.cs
index 9c57fa83..b21c902a 100644
--- a/src/X.PagedList/PagedList.cs
+++ b/src/X.PagedList/PagedList.cs
@@ -2,17 +2,26 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using JetBrains.Annotations;
 
 namespace X.PagedList
 {
+	[PublicAPI]
 	public class PagedList<T, TKey> : BasePagedList<T>
 	{
 		/// <summary>
-		/// Initializes a new instance of the <see cref="PagedList{T}"/> class that divides the supplied superset into subsets the size of the supplied pageSize. The instance then only containes the objects contained in the subset specified by index.
+		/// Initializes a new instance of the <see cref="PagedList{T}"/> class that divides the supplied superset into
+		/// subsets the size of the supplied pageSize. The instance then only contains the objects contained in the
+		/// subset specified by index.
 		/// </summary>
-		/// <param name="superset">The collection of objects to be divided into subsets. If the collection implements <see cref="IQueryable{T}"/>, it will be treated as such.</param>
+		/// <param name="superset">
+		/// The collection of objects to be divided into subsets. If the collection
+		/// implements <see cref="IQueryable{T}"/>, it will be treated as such.
+		/// </param>
 		/// <param name="keySelector">Expression for Order</param>
-		/// <param name="pageNumber">The one-based index of the subset of objects to be contained by this instance.</param>
+		/// <param name="pageNumber">
+		/// The one-based index of the subset of objects to be contained by this instance.
+		/// </param>
 		/// <param name="pageSize">The maximum size of any individual subset.</param>
 		/// <exception cref="ArgumentOutOfRangeException">The specified index cannot be less than zero.</exception>
 		/// <exception cref="ArgumentOutOfRangeException">The specified page size cannot be less than one.</exception>
@@ -48,10 +57,12 @@ private void InitSubset(IEnumerable<T> superset, Func<T, TKey> keySelectorMethod
 	}
 
 	/// <summary>
-	/// Represents a subset of a collection of objects that can be individually accessed by index and containing metadata about the superset collection of objects this subset was created from.
+	/// Represents a subset of a collection of objects that can be individually accessed by index and containing
+	/// metadata about the superset collection of objects this subset was created from.
 	/// </summary>
 	/// <remarks>
-	/// Represents a subset of a collection of objects that can be individually accessed by index and containing metadata about the superset collection of objects this subset was created from.
+	/// Represents a subset of a collection of objects that can be individually accessed by index and containing
+	/// metadata about the superset collection of objects this subset was created from.
 	/// </remarks>
 	/// <typeparam name="T">The type of object the collection should contain.</typeparam>
 	/// <seealso cref="IPagedList{T}"/>
@@ -61,17 +72,24 @@ private void InitSubset(IEnumerable<T> superset, Func<T, TKey> keySelectorMethod
 	public class PagedList<T> : BasePagedList<T>
 	{
 		/// <summary>
-		/// Initializes a new instance of the <see cref="PagedList{T}"/> class that divides the supplied superset into subsets the size of the supplied pageSize. The instance then only containes the objects contained in the subset specified by index.
+		/// Initializes a new instance of the <see cref="PagedList{T}"/> class that divides the supplied superset
+		/// into subsets the size of the supplied pageSize. The instance then only contains the objects contained
+		/// in the subset specified by index.
 		/// </summary>
-		/// <param name="superset">The collection of objects to be divided into subsets. If the collection implements <see cref="IQueryable{T}"/>, it will be treated as such.</param>
-		/// <param name="pageNumber">The one-based index of the subset of objects to be contained by this instance.</param>
+		/// <param name="superset">
+		/// The collection of objects to be divided into subsets. If the collection
+		/// implements <see cref="IQueryable{T}"/>, it will be treated as such.
+		/// </param>
+		/// <param name="pageNumber">
+		/// The one-based index of the subset of objects to be contained by this instance.
+		/// </param>
 		/// <param name="pageSize">The maximum size of any individual subset.</param>
 		/// <exception cref="ArgumentOutOfRangeException">The specified index cannot be less than zero.</exception>
 		/// <exception cref="ArgumentOutOfRangeException">The specified page size cannot be less than one.</exception>
 		public PagedList(IQueryable<T> superset, int pageNumber, int pageSize)
 			: base(pageNumber, pageSize, superset?.Count() ?? 0)
 		{
-			if (TotalItemCount > 0)
+			if (TotalItemCount > 0 && superset != null)
 			{
 				Subset.AddRange(pageNumber == 1
 					? superset.Take(pageSize).ToList()
@@ -81,9 +99,14 @@ public PagedList(IQueryable<T> superset, int pageNumber, int pageSize)
 		}
 
 		/// <summary>
-		/// Initializes a new instance of the <see cref="PagedList{T}"/> class that divides the supplied superset into subsets the size of the supplied pageSize. The instance then only containes the objects contained in the subset specified by index.
+		/// Initializes a new instance of the <see cref="PagedList{T}"/> class that divides the supplied superset
+		/// into subsets the size of the supplied pageSize. The instance then only contains the objects contained in
+		/// the subset specified by index.
 		/// </summary>
-		/// <param name="superset">The collection of objects to be divided into subsets. If the collection implements <see cref="IQueryable{T}"/>, it will be treated as such.</param>
+		/// <param name="superset">
+		/// The collection of objects to be divided into subsets. If the collection
+		/// implements <see cref="IQueryable{T}"/>, it will be treated as such.
+		/// </param>
 		/// <param name="pageNumber">The one-based index of the subset of objects to be contained by this instance.</param>
 		/// <param name="pageSize">The maximum size of any individual subset.</param>
 		/// <exception cref="ArgumentOutOfRangeException">The specified index cannot be less than zero.</exception>
diff --git a/src/X.PagedList/PagedListExtensions.cs b/src/X.PagedList/PagedListExtensions.cs
index c25b4488..9316f4d4 100644
--- a/src/X.PagedList/PagedListExtensions.cs
+++ b/src/X.PagedList/PagedListExtensions.cs
@@ -4,16 +4,19 @@
 using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 
 namespace X.PagedList
 {
     /// <summary>
     /// Container for extension methods designed to simplify the creation of instances of <see cref="PagedList{T}"/>.
     /// </summary>
+    [PublicAPI]
     public static class PagedListExtensions
     {
         /// <summary>
-        /// Splits a collection of objects into n pages with an (for example, if I have a list of 45 shoes and say 'shoes.Split(5)' I will now have 4 pages of 10 shoes and 1 page of 5 shoes.
+        /// Splits a collection of objects into n pages with an (for example, if I have a list of 45 shoes and
+        /// say 'shoes.Split(5)' I will now have 4 pages of 10 shoes and 1 page of 5 shoes.
         /// </summary>
         /// <typeparam name="T">The type of object the collection should contain.</typeparam>
         /// <param name="superset">The collection of objects to be divided into subsets.</param>
@@ -39,7 +42,9 @@ public static IEnumerable<IEnumerable<T>> Split<T>(this IEnumerable<T> superset,
         }
 
         /// <summary>
-        /// Splits a collection of objects into an unknown number of pages with n items per page (for example, if I have a list of 45 shoes and say 'shoes.Partition(10)' I will now have 4 pages of 10 shoes and 1 page of 5 shoes.
+        /// Splits a collection of objects into an unknown number of pages with n items per page (for example,
+        /// if I have a list of 45 shoes and say 'shoes.Partition(10)' I will now have 4 pages of 10 shoes and
+        /// 1 page of 5 shoes.
         /// </summary>
         /// <typeparam name="T">The type of object the collection should contain.</typeparam>
         /// <param name="superset">The collection of objects to be divided into subsets.</param>
@@ -48,7 +53,7 @@ public static IEnumerable<IEnumerable<T>> Split<T>(this IEnumerable<T> superset,
         public static IEnumerable<IEnumerable<T>> Partition<T>(this IEnumerable<T> superset, int pageSize)
         {
             // Cache this to avoid evaluating it twice
-            int count = superset.Count();
+            var count = superset.Count();
 
             if (count < pageSize)
             {
@@ -66,13 +71,20 @@ public static IEnumerable<IEnumerable<T>> Partition<T>(this IEnumerable<T> super
         }
 
         /// <summary>
-        /// Creates a subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.
+        /// Creates a subset of this collection of objects that can be individually accessed by index and containing
+        /// metadata about the collection of objects the subset was created from.
         /// </summary>
         /// <typeparam name="T">The type of object the collection should contain.</typeparam>
-        /// <param name="superset">The collection of objects to be divided into subsets. If the collection implements <see cref="IQueryable{T}"/>, it will be treated as such.</param>
-        /// <param name="pageNumber">The one-based index of the subset of objects to be contained by this instance.</param>
+        /// <param name="superset">
+        /// The collection of objects to be divided into subsets. If the collection
+        /// implements <see cref="IQueryable{T}"/>, it will be treated as such.
+        /// </param>
+        /// <param name="pageNumber">
+        /// The one-based index of the subset of objects to be contained by this instance.
+        /// </param>
         /// <param name="pageSize">The maximum size of any individual subset.</param>
-        /// <returns>A subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.</returns>
+        /// <returns>A subset of this collection of objects that can be individually accessed by index and containing
+        /// metadata about the collection of objects the subset was created from.</returns>
         /// <seealso cref="PagedList{T}"/>
         public static IPagedList<T> ToPagedList<T>(this IEnumerable<T> superset, int pageNumber, int pageSize)
         {
@@ -80,11 +92,16 @@ public static IPagedList<T> ToPagedList<T>(this IEnumerable<T> superset, int pag
         }
 
         /// <summary>
-        /// Creates a subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.
+        /// Creates a subset of this collection of objects that can be individually accessed by index and containing
+        /// metadata about the collection of objects the subset was created from.
         /// </summary>
         /// <typeparam name="T">The type of object the collection should contain.</typeparam>
-        /// <param name="superset">The collection of objects to be divided into subsets. If the collection implements <see cref="IQueryable{T}"/>, it will be treated as such.</param>       
-        /// <returns>A subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.</returns>
+        /// <param name="superset">
+        /// The collection of objects to be divided into subsets. If the
+        /// collection implements <see cref="IQueryable{T}"/>, it will be treated as such.
+        /// </param>       
+        /// <returns>A subset of this collection of objects that can be individually accessed by index and containing
+        /// metadata about the collection of objects the subset was created from.</returns>
         /// <seealso cref="PagedList{T}"/>
         public static IPagedList<T> ToPagedList<T>(this IEnumerable<T> superset)
         {
@@ -108,41 +125,64 @@ public static IPagedList<TResult> Select<TSource, TResult>(this IPagedList<TSour
         }
 
         /// <summary>
-        /// Creates a subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.
+        /// Creates a subset of this collection of objects that can be individually accessed by index and containing
+        /// metadata about the collection of objects the subset was created from.
         /// </summary>
         /// <typeparam name="T">The type of object the collection should contain.</typeparam>
         /// <typeparam name="TKey">Type For Compare</typeparam>
-        /// <param name="superset">The collection of objects to be divided into subsets. If the collection implements <see cref="IQueryable{T}"/>, it will be treated as such.</param>
+        /// <param name="superset">
+        /// The collection of objects to be divided into subsets. If the collection
+        /// implements <see cref="IQueryable{T}"/>, it will be treated as such.
+        /// </param>
         /// <param name="keySelector">Expression for Order</param>
-        /// <param name="pageNumber">The one-based index of the subset of objects to be contained by this instance.</param>
+        /// <param name="pageNumber">
+        /// The one-based index of the subset of objects to be contained by this instance.
+        /// </param>
         /// <param name="pageSize">The maximum size of any individual subset.</param>
-        /// <returns>A subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.</returns>
+        /// <returns>
+        /// A subset of this collection of objects that can be individually accessed by index and containing
+        /// metadata about the collection of objects the subset was created from.
+        /// </returns>
         public static IPagedList<T> ToPagedList<T, TKey>(this IQueryable<T> superset, Expression<Func<T, TKey>> keySelector, int pageNumber, int pageSize)
         {
             return new PagedList<T, TKey>(superset, keySelector, pageNumber, pageSize);
         }
 
         /// <summary>
-        /// Creates a subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.
+        /// Creates a subset of this collection of objects that can be individually accessed by index and containing
+        /// metadata about the collection of objects the subset was created from.
         /// </summary>
         /// <typeparam name="T">The type of object the collection should contain.</typeparam>
         /// <typeparam name="TKey">Type For Compare</typeparam>
-        /// <param name="superset">The collection of objects to be divided into subsets. If the collection implements <see cref="IEnumerable{T}"/>, it will be treated as such.</param>
+        /// <param name="superset">
+        /// The collection of objects to be divided into subsets. If the collection
+        /// implements <see cref="IEnumerable{T}"/>, it will be treated as such.
+        /// </param>
         /// <param name="keySelector">Expression for Order</param>
         /// <param name="pageNumber">The one-based index of the subset of objects to be contained by this instance.</param>
         /// <param name="pageSize">The maximum size of any individual subset.</param>
-        /// <returns>A subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.</returns>        
+        /// <returns>
+        /// A subset of this collection of objects that can be individually accessed by index and containing metadata
+        /// about the collection of objects the subset was created from.
+        /// </returns>        
         public static IPagedList<T> ToPagedList<T, TKey>(this IEnumerable<T> superset, Expression<Func<T, TKey>> keySelector, int pageNumber, int pageSize)
         {
             return new PagedList<T, TKey>(superset.AsQueryable(), keySelector, pageNumber, pageSize);
         }
 
 	    /// <summary>
-	    /// Async creates a subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.
+	    /// Async creates a subset of this collection of objects that can be individually accessed by index and
+	    /// containing metadata about the collection of objects the subset was created from.
 	    /// </summary>
 	    /// <typeparam name="T">The type of object the collection should contain.</typeparam>
-	    /// <param name="superset">The collection of objects to be divided into subsets. If the collection implements <see cref="IEnumerable{T}"/>, it will be treated as such.</param>
-	    /// <returns>A subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.</returns>
+	    /// <param name="superset">
+	    /// The collection of objects to be divided into subsets. If the collection
+	    /// implements <see cref="IEnumerable{T}"/>, it will be treated as such.
+	    /// </param>
+	    /// <returns>
+	    /// A subset of this collection of objects that can be individually accessed by index and containing
+	    /// metadata about the collection of objects the subset was created from.
+	    /// </returns>
 	    /// <seealso cref="PagedList{T}"/>
 	    public static async Task<List<T>> ToListAsync<T>(this IEnumerable<T> superset)
 	    {
@@ -150,27 +190,38 @@ public static async Task<List<T>> ToListAsync<T>(this IEnumerable<T> superset)
 	    }
 	    
 	    /// <summary>
-	    /// Async creates a subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.
+	    /// Async creates a subset of this collection of objects that can be individually accessed by index and
+	    /// containing metadata about the collection of objects the subset was created from.
 	    /// </summary>
 	    /// <typeparam name="T">The type of object the collection should contain.</typeparam>
-	    /// <param name="superset">The collection of objects to be divided into subsets. If the collection implements <see cref="IEnumerable{T}"/>, it will be treated as such.</param>
+	    /// <param name="superset">
+	    /// The collection of objects to be divided into subsets. If the collection
+	    /// implements <see cref="IEnumerable{T}"/>, it will be treated as such.
+	    /// </param>
 	    /// <param name="cancellationToken"></param>
-	    /// <returns>A subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.</returns>
+	    /// <returns>
+	    /// A subset of this collection of objects that can be individually accessed by index and containing metadata
+	    /// about the collection of objects the subset was created from.
+	    /// </returns>
 	    /// <seealso cref="PagedList{T}"/>
 	    public static async Task<List<T>> ToListAsync<T>(this IEnumerable<T> superset, CancellationToken cancellationToken)
         {
-			return await Task.Run(() => superset.ToList(), cancellationToken);
+			return await Task.Run(superset.ToList, cancellationToken);
         }
 
 	    /// <summary>
-	    /// Async creates a subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.
+	    /// Async creates a subset of this collection of objects that can be individually accessed by index and
+	    /// containing metadata about the collection of objects the subset was created from.
 	    /// </summary>
 	    /// <typeparam name="T">The type of object the collection should contain.</typeparam>
 	    /// <param name="superset">The collection of objects to be divided into subsets. If the collection implements <see cref="IQueryable{T}"/>, it will be treated as such.</param>
 	    /// <param name="pageNumber">The one-based index of the subset of objects to be contained by this instance.</param>
 	    /// <param name="pageSize">The maximum size of any individual subset.</param>
 	    /// <param name="cancellationToken"></param>
-	    /// <returns>A subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.</returns>
+	    /// <returns>
+	    /// A subset of this collection of objects that can be individually accessed by index and containing metadata
+	    /// about the collection of objects the subset was created from.
+	    /// </returns>
 	    /// <seealso cref="PagedList{T}"/>
 	    public static async Task<IPagedList<T>> ToPagedListAsync<T>(this IQueryable<T> superset, int pageNumber, int pageSize, CancellationToken cancellationToken)
         {
@@ -204,13 +255,22 @@ public static async Task<IPagedList<T>> ToPagedListAsync<T>(this IQueryable<T> s
         }
 	    
 	    /// <summary>
-	    /// Async creates a subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.
+	    /// Async creates a subset of this collection of objects that can be individually accessed by index and
+	    /// containing metadata about the collection of objects the subset was created from.
 	    /// </summary>
 	    /// <typeparam name="T">The type of object the collection should contain.</typeparam>
-	    /// <param name="superset">The collection of objects to be divided into subsets. If the collection implements <see cref="IQueryable{T}"/>, it will be treated as such.</param>
-	    /// <param name="pageNumber">The one-based index of the subset of objects to be contained by this instance.</param>
+	    /// <param name="superset">
+	    /// The collection of objects to be divided into subsets. If the collection
+	    /// implements <see cref="IQueryable{T}"/>, it will be treated as such.
+	    /// </param>
+	    /// <param name="pageNumber">
+	    /// The one-based index of the subset of objects to be contained by this instance.
+	    /// </param>
 	    /// <param name="pageSize">The maximum size of any individual subset.</param>
-	    /// <returns>A subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.</returns>
+	    /// <returns>
+	    /// A subset of this collection of objects that can be individually accessed by index and containing metadata
+	    /// about the collection of objects the subset was created from.
+	    /// </returns>
 	    /// <seealso cref="PagedList{T}"/>
 	    public static async Task<IPagedList<T>> ToPagedListAsync<T>(this IQueryable<T> superset, int pageNumber, int pageSize)
 	    {
@@ -218,14 +278,23 @@ public static async Task<IPagedList<T>> ToPagedListAsync<T>(this IQueryable<T> s
 	    }
 
 	    /// <summary>
-	    /// Creates a subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.
+	    /// Creates a subset of this collection of objects that can be individually accessed by index and containing
+	    /// metadata about the collection of objects the subset was created from.
 	    /// </summary>
 	    /// <typeparam name="T">The type of object the collection should contain.</typeparam>
-	    /// <param name="superset">The collection of objects to be divided into subsets. If the collection implements <see cref="IEnumerable{T}"/>, it will be treated as such.</param>
-	    /// <param name="pageNumber">The one-based index of the subset of objects to be contained by this instance.</param>
+	    /// <param name="superset">
+	    /// The collection of objects to be divided into subsets. If the collection
+	    /// implements <see cref="IEnumerable{T}"/>, it will be treated as such.
+	    /// </param>
+	    /// <param name="pageNumber">
+	    /// The one-based index of the subset of objects to be contained by this instance.
+	    /// </param>
 	    /// <param name="pageSize">The maximum size of any individual subset.</param>
 	    /// <param name="cancellationToken"></param>
-	    /// <returns>A subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.</returns>
+	    /// <returns>
+	    /// A subset of this collection of objects that can be individually accessed by index and containing metadata
+	    /// about the collection of objects the subset was created from.
+	    /// </returns>
 	    /// <seealso cref="PagedList{T}"/>
 	    public static async Task<IPagedList<T>> ToPagedListAsync<T>(this IEnumerable<T> superset, int pageNumber, int pageSize, CancellationToken cancellationToken)
         {
@@ -233,13 +302,22 @@ public static async Task<IPagedList<T>> ToPagedListAsync<T>(this IEnumerable<T>
         }
 	    
 	    /// <summary>
-	    /// Creates a subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.
+	    /// Creates a subset of this collection of objects that can be individually accessed by index and containing
+	    /// metadata about the collection of objects the subset was created from.
 	    /// </summary>
 	    /// <typeparam name="T">The type of object the collection should contain.</typeparam>
-	    /// <param name="superset">The collection of objects to be divided into subsets. If the collection implements <see cref="IEnumerable{T}"/>, it will be treated as such.</param>
-	    /// <param name="pageNumber">The one-based index of the subset of objects to be contained by this instance.</param>
+	    /// <param name="superset">
+	    /// The collection of objects to be divided into subsets. If the collection
+	    /// implements <see cref="IEnumerable{T}"/>, it will be treated as such.
+	    /// </param>
+	    /// <param name="pageNumber">
+	    /// The one-based index of the subset of objects to be contained by this instance.
+	    /// </param>
 	    /// <param name="pageSize">The maximum size of any individual subset.</param>
-	    /// <returns>A subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.</returns>
+	    /// <returns>
+	    /// A subset of this collection of objects that can be individually accessed by index and containing metadata
+	    /// about the collection of objects the subset was created from.
+	    /// </returns>
 	    /// <seealso cref="PagedList{T}"/>
 	    public static async Task<IPagedList<T>> ToPagedListAsync<T>(this IEnumerable<T> superset, int pageNumber, int pageSize)
         {
@@ -247,14 +325,20 @@ public static async Task<IPagedList<T>> ToPagedListAsync<T>(this IEnumerable<T>
         }
 
 	    /// <summary>
-	    /// Async creates a subset of this collection of objects that can be individually accessed by index (defaulting to the first page) and containing metadata about the collection of objects the subset was created from.
+	    /// Async creates a subset of this collection of objects that can be individually accessed by index (defaulting
+	    /// to the first page) and containing metadata about the collection of objects the subset was created from.
 	    /// </summary>
 	    /// <typeparam name="T">The type of object the collection should contain.</typeparam>
 	    /// <param name="superset"></param>
-	    /// <param name="pageNumber">The one-based index of the subset of objects to be contained by this instance, defaulting to the first page.</param>
+	    /// <param name="pageNumber">
+	    /// The one-based index of the subset of objects to be contained by this instance,  defaulting to the first page.
+	    /// </param>
 	    /// <param name="pageSize">The maximum size of any individual subset.</param>
 	    /// <param name="cancellationToken"></param>
-	    /// <returns>A subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.</returns>
+	    /// <returns>
+	    /// A subset of this collection of objects that can be individually accessed by index and containing
+	    /// metadata about the collection of objects the subset was created from.
+	    /// </returns>
 	    /// <seealso cref="PagedList{T}"/>
 	    public static async Task<IPagedList<T>> ToPagedListAsync<T>(this IQueryable<T> superset, int? pageNumber, int pageSize, CancellationToken cancellationToken)
         {
@@ -262,13 +346,21 @@ public static async Task<IPagedList<T>> ToPagedListAsync<T>(this IQueryable<T> s
         }
 	    
 	    /// <summary>
-	    /// Async creates a subset of this collection of objects that can be individually accessed by index (defaulting to the first page) and containing metadata about the collection of objects the subset was created from.
+	    /// Async creates a subset of this collection of objects that can be individually accessed by index
+	    /// (defaulting to the first page) and containing metadata about the collection of objects the subset
+	    /// was created from.
 	    /// </summary>
 	    /// <typeparam name="T">The type of object the collection should contain.</typeparam>
 	    /// <param name="superset"></param>
-	    /// <param name="pageNumber">The one-based index of the subset of objects to be contained by this instance, defaulting to the first page.</param>
+	    /// <param name="pageNumber">
+	    /// The one-based index of the subset of objects to be contained by this instance,
+	    /// defaulting to the first page.
+	    /// </param>
 	    /// <param name="pageSize">The maximum size of any individual subset.</param>
-	    /// <returns>A subset of this collection of objects that can be individually accessed by index and containing metadata about the collection of objects the subset was created from.</returns>
+	    /// <returns>
+	    /// A subset of this collection of objects that can be individually accessed by index and containing metadata
+	    /// about the collection of objects the subset was created from.
+	    /// </returns>
 	    /// <seealso cref="PagedList{T}"/>
 	    public static async Task<IPagedList<T>> ToPagedListAsync<T>(this IQueryable<T> superset, int? pageNumber, int pageSize)
         {
diff --git a/src/X.PagedList/PagedListMetaData.cs b/src/X.PagedList/PagedListMetaData.cs
index f0cd49bb..23b90252 100644
--- a/src/X.PagedList/PagedListMetaData.cs
+++ b/src/X.PagedList/PagedListMetaData.cs
@@ -1,8 +1,11 @@
-namespace X.PagedList
+using JetBrains.Annotations;
+
+namespace X.PagedList
 {
 	///<summary>
 	/// Non-enumerable version of the PagedList class.
 	///</summary>    
+	[PublicAPI]
 	public class PagedListMetaData : IPagedList
 	{
 		/// <summary>
@@ -73,42 +76,52 @@ public PagedListMetaData(IPagedList pagedList)
 		public bool HasPreviousPage { get; protected set; }
 
 		/// <summary>
-        /// 	Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is NOT the last subset within the superset.
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+        /// is NOT the last subset within the superset.
 		/// </summary>
 		/// <value>
-        /// 	Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is NOT the last subset within the superset.
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+        /// is NOT the last subset within the superset.
 		/// </value>
 		public bool HasNextPage { get; protected set; }
 
 		/// <summary>
-        /// 	Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is the first subset within the superset.
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+        /// is the first subset within the superset.
 		/// </summary>
 		/// <value>
-        /// 	Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is the first subset within the superset.
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and
+        /// this is the first subset within the superset.
 		/// </value>
 		public bool IsFirstPage { get; protected set; }
 
 		/// <summary>
-        /// 	Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is the last subset within the superset.
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and
+        /// this is the last subset within the superset.
 		/// </summary>
 		/// <value>
-        /// 	Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this is the last subset within the superset.
+        /// Returns true if the superset is not empty and PageNumber is less than or equal to PageCount and this
+        /// is the last subset within the superset.
 		/// </value>
 		public bool IsLastPage { get; protected set; }
 
 		/// <summary>
-        /// 	One-based index of the first item in the paged subset, zero if the superset is empty or PageNumber is greater than PageCount.
+        /// One-based index of the first item in the paged subset, zero if the superset is empty or PageNumber
+        /// is greater than PageCount.
 		/// </summary>
 		/// <value>
-        /// 	One-based index of the first item in the paged subset, zero if the superset is empty or PageNumber is greater than PageCount.
+        /// One-based index of the first item in the paged subset, zero if the superset is empty or PageNumber
+        /// is greater than PageCount.
 		/// </value>
 		public int FirstItemOnPage { get; protected set; }
 
 		/// <summary>
-        /// 	One-based index of the last item in the paged subset, zero if the superset is empty or PageNumber is greater than PageCount.
+        /// One-based index of the last item in the paged subset, zero if the superset is empty or PageNumber
+        /// is greater than PageCount.
 		/// </summary>
 		/// <value>
-        /// 	One-based index of the last item in the paged subset, zero if the superset is empty or PageNumber is greater than PageCount.
+        /// One-based index of the last item in the paged subset, zero if the superset is empty or PageNumber
+        /// is greater than PageCount.
 		/// </value>
 		public int LastItemOnPage { get; protected set; }
 
diff --git a/src/X.PagedList/StaticPagedList.cs b/src/X.PagedList/StaticPagedList.cs
index bcc086b8..c785cfd5 100644
--- a/src/X.PagedList/StaticPagedList.cs
+++ b/src/X.PagedList/StaticPagedList.cs
@@ -1,25 +1,35 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
 
 namespace X.PagedList
 {
     /// <summary>
-    /// Represents a subset of a collection of objects that can be individually accessed by index and containing metadata about the superset collection of objects this subset was created from.
+    /// Represents a subset of a collection of objects that can be individually accessed by index and containing
+    /// metadata about the superset collection of objects this subset was created from.
     /// </summary>
     /// <remarks>
-    /// Represents a subset of a collection of objects that can be individually accessed by index and containing metadata about the superset collection of objects this subset was created from.
+    /// Represents a subset of a collection of objects that can be individually accessed by index and containing
+    /// metadata about the superset collection of objects this subset was created from.
     /// </remarks>
     /// <typeparam name="T">The type of object the collection should contain.</typeparam>
     /// <seealso cref="IPagedList{T}"/>
     /// <seealso cref="BasePagedList{T}"/>
     /// <seealso cref="PagedList{T}"/>
     /// <seealso cref="List{T}"/>
+    [PublicAPI]
     public class StaticPagedList<T> : BasePagedList<T>
 	{
 		/// <summary>
-		/// Initializes a new instance of the <see cref="StaticPagedList{T}"/> class that contains the already divided subset and information about the size of the superset and the subset's position within it.
+		/// Initializes a new instance of the <see cref="StaticPagedList{T}"/> class that contains the already
+		/// divided subset and information about the size of the superset and the subset's position within it.
 		/// </summary>
 		/// <param name="subset">The single subset this collection should represent.</param>
-		/// <param name="metaData">Supply the ".MetaData" property of an existing IPagedList instance to recreate it here (such as when creating a new instance of a PagedList after having used Automapper to convert its contents to a DTO.)</param>
+		/// <param name="metaData">
+		/// Supply the ".MetaData" property of an existing IPagedList instance to recreate
+		/// it here (such as when creating a new instance of a PagedList after having used Automapper to convert
+		/// its contents to a DTO.)
+		/// </param>
 		/// <exception cref="ArgumentOutOfRangeException">The specified index cannot be less than zero.</exception>
 		/// <exception cref="ArgumentOutOfRangeException">The specified page size cannot be less than one.</exception>
 		public StaticPagedList(IEnumerable<T> subset, IPagedList metaData)
@@ -28,7 +38,8 @@ public StaticPagedList(IEnumerable<T> subset, IPagedList metaData)
 		}
 
 		/// <summary>
-		/// Initializes a new instance of the <see cref="StaticPagedList{T}"/> class that contains the already divided subset and information about the size of the superset and the subset's position within it.
+		/// Initializes a new instance of the <see cref="StaticPagedList{T}"/> class that contains the already
+		/// divided subset and information about the size of the superset and the subset's position within it.
 		/// </summary>
 		/// <param name="subset">The single subset this collection should represent.</param>
 		/// <param name="pageNumber">The one-based index of the subset of objects contained by this instance.</param>
diff --git a/src/X.PagedList/X.PagedList.csproj b/src/X.PagedList/X.PagedList.csproj
index a17ef93b..df78fc83 100644
--- a/src/X.PagedList/X.PagedList.csproj
+++ b/src/X.PagedList/X.PagedList.csproj
@@ -20,6 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2021.1.0" />
     <PackageReference Include="System.Linq.Expressions" Version="4.3.0" Condition="'$(TargetFramework)' == 'netstandard1.1'" />
     <PackageReference Include="System.Linq.Queryable" Version="4.3.0" Condition="'$(TargetFramework)' == 'netstandard1.1'" />
   </ItemGroup>
diff --git a/tests/X.PagedList.Tests/X.PagedList.Tests.csproj b/tests/X.PagedList.Tests/X.PagedList.Tests.csproj
index 6e598484..bddd1070 100644
--- a/tests/X.PagedList.Tests/X.PagedList.Tests.csproj
+++ b/tests/X.PagedList.Tests/X.PagedList.Tests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>