diff --git a/build.bat b/build.bat
deleted file mode 100644
index 62e42db..0000000
--- a/build.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-@Echo OFF
-SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin
-
-MSbuild "src\Atata.WebDriverExtras\Atata.WebDriverExtras.csproj" /p:Configuration=Release
-Echo Build process completed
-
-..\nuget pack src\Atata.WebDriverExtras.nuspec
-Echo NuGet package created
-
-Set /p Wait=Press Enter to continue...
\ No newline at end of file
diff --git a/src/Atata.WebDriverExtras.nuspec b/src/Atata.WebDriverExtras.nuspec
deleted file mode 100644
index 9e2b6bf..0000000
--- a/src/Atata.WebDriverExtras.nuspec
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-    <id>Atata.WebDriverExtras</id>
-    <title>Atata WebDriver Extras</title>
-    <version>0.12.0</version>
-    <authors>Yevgeniy Shunevych</authors>
-    <owners>Yevgeniy Shunevych</owners>
-    <licenseUrl>https://raw.githubusercontent.com/atata-framework/atata-webdriverextras/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/atata-framework/atata-webdriverextras</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/atata-framework/atata/master/logo.png?v2</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <summary>A set of extension methods and other extra classes for Selenium WebDriver. Is a part of Atata Framework.</summary>
-    <description>A set of extension methods and other extra classes for Selenium WebDriver. Is a part of Atata Framework.</description>
-    <releaseNotes>
-0.12.0 - https://atata-framework.github.io/blog/2017/09/20/atata.webdriverextras-0.12.0-released/
-0.11.0 - Initial release.
-    </releaseNotes>
-    <copyright>© Yevgeniy Shunevych</copyright>
-    <tags>atata automation testing test selenium webdriver browser</tags>
-    <dependencies>
-      <dependency id="Selenium.WebDriver" version="3.5.2" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="..\LICENSE" />
-    <file src="Atata.WebDriverExtras\bin\Release\Atata.WebDriverExtras.dll" target="lib\net40" />
-    <file src="Atata.WebDriverExtras\bin\Release\Atata.WebDriverExtras.xml" target="lib\net40" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/src/Atata.WebDriverExtras.sln b/src/Atata.WebDriverExtras.sln
index d52db3f..35abb7a 100644
--- a/src/Atata.WebDriverExtras.sln
+++ b/src/Atata.WebDriverExtras.sln
@@ -1,15 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.12
+VisualStudioVersion = 15.0.26730.16
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atata.WebDriverExtras", "Atata.WebDriverExtras\Atata.WebDriverExtras.csproj", "{A08C24D1-7904-4A0C-BF07-5AEF4A520D82}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atata.WebDriverExtras", "Atata.WebDriverExtras\Atata.WebDriverExtras.csproj", "{A08C24D1-7904-4A0C-BF07-5AEF4A520D82}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C1EE9AF4-F99C-4477-8690-4E6B1AEAFA87}"
 	ProjectSection(SolutionItems) = preProject
 		Atata.ruleset = Atata.ruleset
-		Atata.WebDriverExtras.nuspec = Atata.WebDriverExtras.nuspec
-		..\build.bat = ..\build.bat
 		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
@@ -27,4 +25,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {25575559-44E6-4A56-B7D8-071D000BC836}
+	EndGlobalSection
 EndGlobal
diff --git a/src/Atata.WebDriverExtras/Atata.WebDriverExtras.csproj b/src/Atata.WebDriverExtras/Atata.WebDriverExtras.csproj
index 72f81bf..4e28131 100644
--- a/src/Atata.WebDriverExtras/Atata.WebDriverExtras.csproj
+++ b/src/Atata.WebDriverExtras/Atata.WebDriverExtras.csproj
@@ -1,98 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A08C24D1-7904-4A0C-BF07-5AEF4A520D82}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFrameworks>net40;net45;netstandard2.0</TargetFrameworks>
     <RootNamespace>Atata</RootNamespace>
-    <AssemblyName>Atata.WebDriverExtras</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <Version>0.13.0</Version>
+    <Authors>Yevgeniy Shunevych</Authors>
+    <Company>Yevgeniy Shunevych</Company>
+    <Title>Atata WebDriver Extras</Title>
+    <Product>Atata Framework</Product>
+    <Description>A set of extension methods and other extra classes for Selenium WebDriver. Is a part of Atata Framework.</Description>
+    <Copyright>© Yevgeniy Shunevych 2017</Copyright>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/atata-framework/atata-webdriverextras/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/atata-framework/atata-webdriverextras</PackageProjectUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/atata-framework/atata/master/logo.png?v2</PackageIconUrl>
+    <RepositoryUrl>https://github.com/atata-framework/atata-webdriverextras</RepositoryUrl>
+    <PackageTags>atata automation testing test selenium webdriver browser</PackageTags>
+    <PackageReleaseNotes>0.12.0 - https://atata-framework.github.io/blog/2017/09/20/atata.webdriverextras-0.12.0-released/
+0.11.0 - Initial release.</PackageReleaseNotes>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>1591</NoWarn>
-    <DocumentationFile>bin\Debug\Atata.WebDriverExtras.xml</DocumentationFile>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net40|AnyCPU'">
+    <DocumentationFile>bin\Debug\net40\Atata.WebDriverExtras.xml</DocumentationFile>
     <CodeAnalysisRuleSet>..\atata.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net40|AnyCPU'">
+    <DocumentationFile>bin\Release\net40\Atata.WebDriverExtras.xml</DocumentationFile>
     <CodeAnalysisRuleSet>..\atata.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Atata.WebDriverExtras.xml</DocumentationFile>
   </PropertyGroup>
+  
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
+    <DocumentationFile>bin\Debug\net45\Atata.WebDriverExtras.xml</DocumentationFile>
+    <CodeAnalysisRuleSet>..\atata.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
+    <DocumentationFile>bin\Release\net45\Atata.WebDriverExtras.xml</DocumentationFile>
+    <CodeAnalysisRuleSet>..\atata.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
+    <DocumentationFile>bin\Debug\netstandard2.0\Atata.WebDriverExtras.xml</DocumentationFile>
+    <CodeAnalysisRuleSet>..\atata.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
+    <DocumentationFile>bin\Release\netstandard2.0\Atata.WebDriverExtras.xml</DocumentationFile>
+    <CodeAnalysisRuleSet>..\atata.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WebDriver, Version=3.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.WebDriver.3.5.2\lib\net40\WebDriver.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Extensions\CheckExtensions.cs" />
-    <Compile Include="RetryOptions.cs" />
-    <Compile Include="StaleSafely.cs" />
-    <Compile Include="Visibility.cs" />
-    <Compile Include="Exceptions\ExceptionFactory.cs" />
-    <Compile Include="Exceptions\NotMissingElementException.cs" />
-    <Compile Include="Extensions\ByExtensions.cs" />
-    <Compile Include="Extensions\ByKindExtensions.cs" />
-    <Compile Include="Extensions\IEnumerableExtensions.cs" />
-    <Compile Include="Extensions\ISearchContextExtensions.cs" />
-    <Compile Include="Extensions\ITimeoutsExtensions.cs" />
-    <Compile Include="Extensions\IWebDriverExtensions.cs" />
-    <Compile Include="Extensions\IWebElementExtensions.cs" />
-    <Compile Include="Extensions\TypeExtensions.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SafeWait`1.cs" />
-    <Compile Include="SearchContexts\ExtendedSearchContext`1.cs" />
-    <Compile Include="SearchContexts\IExtendedSearchContext.cs" />
-    <Compile Include="SearchContexts\WebDriverExtendedSearchContext.cs" />
-    <Compile Include="SearchContexts\WebElementExtendedSearchContext.cs" />
-    <Compile Include="ExtendedBy.cs" />
-    <Compile Include="RetrySettings.cs" />
-    <Compile Include="SearchOptions.cs" />
-    <Compile Include="XPathBuilder.cs" />
-    <Compile Include="XPathBuilder`1.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Atata.ruleset">
-      <Link>Properties\Atata.ruleset</Link>
-    </None>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <PackageReference Include="Selenium.WebDriver" Version="3.6.0" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/Atata.WebDriverExtras/Properties/AssemblyInfo.cs b/src/Atata.WebDriverExtras/Properties/AssemblyInfo.cs
deleted file mode 100644
index 1fa6ca5..0000000
--- a/src/Atata.WebDriverExtras/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Atata.WebDriverExtras")]
-[assembly: AssemblyDescription("A set of extension methods and other extra classes for Selenium WebDriver.")]
-[assembly: Guid("a08c24d1-7904-4a0c-bf07-5aef4a520d82")]
-
-[assembly: AssemblyCompany("Yevgeniy Shunevych")]
-[assembly: AssemblyProduct("Atata Framework")]
-[assembly: AssemblyCopyright("Copyright © Yevgeniy Shunevych 2017")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("0.12.0")]
-[assembly: AssemblyFileVersion("0.12.0")]
\ No newline at end of file
diff --git a/src/Atata.WebDriverExtras/packages.config b/src/Atata.WebDriverExtras/packages.config
deleted file mode 100644
index 0b144c0..0000000
--- a/src/Atata.WebDriverExtras/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Selenium.WebDriver" version="3.5.2" targetFramework="net40" />
-  <package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net40" developmentDependency="true" />
-</packages>
\ No newline at end of file