diff --git a/src/IniParser/IniDataParser.cs b/src/IniParser/IniDataParser.cs
index 63a0e22a..70623da7 100644
--- a/src/IniParser/IniDataParser.cs
+++ b/src/IniParser/IniDataParser.cs
@@ -6,7 +6,6 @@
 using System.IO;
 using IniParser.Parser;
 using IniParser.Model;
-using static IniParser.Parser.StringBuffer;
 
 namespace IniParser
 {
@@ -246,7 +245,7 @@ protected virtual bool ProcessComment(StringBuffer currentLine)
             // the comment delimiter
             var startIdx = commentRange.start + Scheme.CommentString.Length;
             var size = currentLineTrimmed.Count - Scheme.CommentString.Length;
-            var range = Range.FromIndexWithSize(startIdx, size);
+            var range = StringBuffer.Range.FromIndexWithSize(startIdx, size);
 
             var comment = currentLineTrimmed.Substring(range);
             if (Configuration.TrimComments)
@@ -345,10 +344,10 @@ protected virtual bool ProcessProperty(StringBuffer currentLine, IniData iniData
 
             if (propertyAssigmentIdx.IsEmpty) return false;
 
-            var keyRange = Range.WithIndexes(0, propertyAssigmentIdx.start - 1);
+            var keyRange = StringBuffer.Range.WithIndexes(0, propertyAssigmentIdx.start - 1);
             var valueStartIdx = propertyAssigmentIdx.end + 1;
             var valueSize = currentLine.Count - propertyAssigmentIdx.end - 1;
-            var valueRange = Range.FromIndexWithSize(valueStartIdx, valueSize);
+            var valueRange = StringBuffer.Range.FromIndexWithSize(valueStartIdx, valueSize);
 
             var key = currentLine.Substring(keyRange);
             var value = currentLine.Substring(valueRange);
diff --git a/src/IniParser/IniParser.csproj b/src/IniParser/IniParser.csproj
index c2a561bf..0a2f21eb 100644
--- a/src/IniParser/IniParser.csproj
+++ b/src/IniParser/IniParser.csproj
@@ -11,7 +11,7 @@ Also implements merging operations, both for complete ini files, sections, or ev
 		<Authors>Ricardo Amores Hernández</Authors>
 		<PackageProjectUrl>https://github.com/rickyah/ini-parser</PackageProjectUrl>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<PackageIconUrl>https://raw.githubusercontent.com/rickyah/ini-parser/development/nuget-ini-icon.png</PackageIconUrl>
+		<PackageIcon>nuget-ini-icon.png</PackageIcon>
 		<Version>3.0</Version>
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>Properties\publickey.snk</AssemblyOriginatorKeyFile>
@@ -24,10 +24,14 @@ Also implements merging operations, both for complete ini files, sections, or ev
 		<Product>INI Parser</Product>
 		<ReleaseVersion></ReleaseVersion>
 	</PropertyGroup>
-
+	
+	<ItemGroup>
+		<None Include="../../nuget-ini-icon.png" Pack="true" PackagePath=""/>
+	</ItemGroup>
+	
 	<!-- Auto-select supported target frameworks based on MSBuild version -->
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
 		<RepositoryUrl>https://github.com/rickyah/ini-parser</RepositoryUrl>
 		<Copyright>Ricardo Amores Hernández 2009-2019</Copyright>
 	</PropertyGroup>