Updated to get around problems I had with some mismatch from NuGet packages I was using.