Merge pull request #292 from ovatsus/master

NuGet fixes