Improved functionality. Updated NuGet package.