diff --git a/BrowserStack.API.Screenshots.sln b/BrowserStack.API.Screenshots.sln
index b7d218f..13a43b6 100644
--- a/BrowserStack.API.Screenshots.sln
+++ b/BrowserStack.API.Screenshots.sln
@@ -1,10 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserStack.API.Screenshots", "BrowserStack.API.Screenshots\BrowserStack.API.Screenshots.csproj", "{1025B377-7530-49D0-9C26-4B12B673C331}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserStack.API.ScreenshotsTests", "BrowserStack.API.ScreenshotsTests\BrowserStack.API.ScreenshotsTests.csproj", "{F3F1F761-0502-40FA-9B66-974088EAF310}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{1025B377-7530-49D0-9C26-4B12B673C331}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1025B377-7530-49D0-9C26-4B12B673C331}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1025B377-7530-49D0-9C26-4B12B673C331}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3F1F761-0502-40FA-9B66-974088EAF310}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3F1F761-0502-40FA-9B66-974088EAF310}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3F1F761-0502-40FA-9B66-974088EAF310}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3F1F761-0502-40FA-9B66-974088EAF310}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/BrowserStack.API.Screenshots/BatchScreenshotsCapture.cs b/BrowserStack.API.Screenshots/BatchScreenshotsCapture.cs
index 9bed2ba..c73e574 100644
--- a/BrowserStack.API.Screenshots/BatchScreenshotsCapture.cs
+++ b/BrowserStack.API.Screenshots/BatchScreenshotsCapture.cs
@@ -84,7 +84,7 @@ internal BatchScreenshotsCapture(IScreenshotsApi screenshotsApi)
         /// <param name="captureThumbnails">if set to <c>true</c> then the batch job will also save the thumbnails when saving the screenshots.</param>
         /// <param name="username">The username.</param>
         /// <param name="password">The password.</param>
-        public BatchScreenshotsCapture(int sessionLimit, bool captureThumbnails, string username, string password):
+        public BatchScreenshotsCapture(int sessionLimit, bool captureThumbnails, string username = null, string password = null):
             this(string.IsNullOrEmpty(username) && string.IsNullOrEmpty(password) ? new ScreenshotsApi() : new ScreenshotsApi(username, password))
         {
             this.sessionLimit = sessionLimit;
@@ -312,6 +312,12 @@ await Task.WhenAll(
                     }));
         }
 
+        public void ExecuteBatch(string rootPath, bool usingTunnel, params BatchCaptureJobInfo[] batchCaptureJobs)
+        {
+            var executeBatchAsync = ExecuteBatchAsync(rootPath, usingTunnel, batchCaptureJobs);
+            executeBatchAsync.GetAwaiter().GetResult(); //To properly re-throw an exception: http://stackoverflow.com/questions/20170527/how-to-correctly-rethrow-an-exception-of-task-already-in-faulted-state
+        }
+
         #endregion
 
         #region Methods
diff --git a/BrowserStack.API.Screenshots/BrowserStack.API.Screenshots.csproj b/BrowserStack.API.Screenshots/BrowserStack.API.Screenshots.csproj
index b6d9f2e..bdd6c93 100644
--- a/BrowserStack.API.Screenshots/BrowserStack.API.Screenshots.csproj
+++ b/BrowserStack.API.Screenshots/BrowserStack.API.Screenshots.csproj
@@ -12,6 +12,8 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <RestorePackages>true</RestorePackages>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -31,19 +33,21 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Extensions">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+    <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="System.Net.Http.Primitives">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+    <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Xml.Linq" />
@@ -74,9 +78,18 @@
     <Compile Include="ScreenshotsApi.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
+  </Target>
   <!-- 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">
diff --git a/BrowserStack.API.Screenshots/Job.cs b/BrowserStack.API.Screenshots/Job.cs
index 91c41d4..f8ef2a0 100644
--- a/BrowserStack.API.Screenshots/Job.cs
+++ b/BrowserStack.API.Screenshots/Job.cs
@@ -101,7 +101,12 @@ public enum States
             /// <summary>
             /// The job has been queued for execution.
             /// </summary>
-            Queue, 
+            Queue,
+
+            /// <summary>
+            /// All jobs has been queued for execution.
+            /// </summary>
+            Queued_all,
 
             /// <summary>
             /// The job has timed out.
@@ -119,15 +124,15 @@ public enum States
         /// </summary>
         public enum WinResolutions
         {
-            /// <summary>
-            /// The r_1024 x 768.
-            /// </summary>
-            R_1024x768, 
-
-            /// <summary>
-            /// The r_1280 x 1024.
-            /// </summary>
-            R_1280x1024, 
+          R_1024x768,
+          R_1280x800,
+          R_1280x1024,
+          R_1366x768,
+          R_1440x900,
+          R_1680x1050,
+          R_1600x1200,
+          R_1920x1080,
+          R_1920x1200,
         }
 
         #endregion
@@ -183,7 +188,7 @@ public class JobInfo
             /// <summary>
             /// Gets or sets the orientation to be used for mobile browsers.
             /// </summary>
-            public Orientations? Orientation { get; set; }
+            public Orientations? Orientation { get; set; } 
 
             /// <summary>
             /// Gets or sets the resolution that will be used to capture screenshots on Mac browsers.
@@ -198,7 +203,7 @@ public class JobInfo
             /// <summary>
             /// Gets or sets the wait time (in seconds).
             /// </summary>
-            public int WaitTime { get; set; }
+            public int WaitTime { get; set; } = 10;
 
             /// <summary>
             /// Gets or sets the resolution that will be used to capture screenshots on Windows browsers.
diff --git a/BrowserStack.API.Screenshots/ScreenshotsApi.cs b/BrowserStack.API.Screenshots/ScreenshotsApi.cs
index ef4e2a1..12b60be 100644
--- a/BrowserStack.API.Screenshots/ScreenshotsApi.cs
+++ b/BrowserStack.API.Screenshots/ScreenshotsApi.cs
@@ -7,6 +7,8 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
+using System.Diagnostics;
+
 namespace BrowserStack.API.Screenshots
 {
     #region Using Directives
@@ -148,12 +150,24 @@ public async Task<IEnumerable<Browser>> GetBrowsersAsync()
                 var response = await httpClient.GetAsync(screenshotsRestAPIBaseUrl + "browsers");
                 response.EnsureSuccessStatusCode();
                 var data = await response.Content.ReadAsStringAsync();
-                var browsers = await JsonConvert.DeserializeObjectAsync<IEnumerable<BrowserInfo>>(data);
+                var browsers = await Task.Factory.StartNew(() => JsonConvert.DeserializeObject<IEnumerable<BrowserInfo>>(data));
 
-                return browsers.Select(x => MapInfoToBrowser(x));
+                return browsers.Select(MapInfoToBrowser);
             }
         }
 
+        /// <summary>
+        /// Retrieves a list of the supported browsers from BrowserStack. See http://www.browserstack.com/list-of-browsers-and-platforms?product=screenshots.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="Browser" />.
+        /// </returns>
+        public IEnumerable<Browser> GetBrowsers()
+        {
+            var browsersJob = GetBrowsersAsync();
+            return browsersJob.GetAwaiter().GetResult(); //To properly re-throw an exception: http://stackoverflow.com/questions/20170527/how-to-correctly-rethrow-an-exception-of-task-already-in-faulted-state
+        }
+
         /// <summary>
         /// Retrieves a job's information.
         /// </summary>
@@ -174,12 +188,27 @@ public async Task<Job> GetJobInfoAsync(string jobId)
                 var response = await httpClient.SendAsync(request);
                 response.EnsureSuccessStatusCode();
                 var data = await response.Content.ReadAsStringAsync();
-                var screenshotJob = await JsonConvert.DeserializeObjectAsync<ScreenshotJob>(data);
+                var screenshotJob = await Task.Factory.StartNew(() => JsonConvert.DeserializeObject<ScreenshotJob>(data));
 
+                System.Diagnostics.Trace.WriteLineIf(Debugger.IsAttached,"GetJobInfoAsync(jobId:"+jobId+") Response Content\n" + data);
                 return MapToJob(screenshotJob);
             }
         }
 
+        /// <summary>
+        /// Retrieves a job's information.
+        /// </summary>
+        /// <param name="jobId">The job id.</param>
+        /// <returns>
+        /// The <see cref="Job" />.
+        /// </returns>
+        public Job GetJobInfo(string jobId)
+        {
+            var startJobAsync = GetJobInfoAsync(jobId);
+            return startJobAsync.GetAwaiter().GetResult(); //To properly re-throw an exception: http://stackoverflow.com/questions/20170527/how-to-correctly-rethrow-an-exception-of-task-already-in-faulted-state
+        }
+
+
         /// <summary>
         /// Saves a screenshot to a local path.
         /// </summary>
@@ -220,6 +249,22 @@ public async Task SaveScreenshotToFileAsync(Screenshot screenshot, string path,
             }
         }
 
+        /// <summary>
+        /// Saves a screenshot to a local path.
+        /// </summary>
+        /// <param name="screenshot">The screenshot.</param>
+        /// <param name="path">The path where the image will be saved to.</param>
+        /// <param name="filename">
+        /// The name of the file where the image will be saved to. The extension will be added automatically according to the image path. 
+        /// If no filename is supplied then the original filename from the BrowserStack url will be used.
+        /// </param>
+        /// <param name="overwrite">If set to true then the file will be overwritten, otherwise no attempt will be made to retrieve the file.</param>
+        public void SaveScreenshotToFile(Screenshot screenshot, string path, string filename = null, bool overwrite = false)
+        {
+            var saveScreenshotToFileAsync = SaveScreenshotToFileAsync(screenshot, path, filename, overwrite);
+            saveScreenshotToFileAsync.GetAwaiter().GetResult(); //To properly re-throw an exception: http://stackoverflow.com/questions/20170527/how-to-correctly-rethrow-an-exception-of-task-already-in-faulted-state
+        }
+
         /// <summary>
         /// Saves a screenshot's thumbnail to a local path.
         /// </summary>
@@ -259,6 +304,22 @@ public async Task SaveThumbnailToFileAsync(Screenshot screenshot, string path, s
             }
         }
 
+        /// <summary>
+        /// Saves a screenshot's thumbnail to a local path.
+        /// </summary>
+        /// <param name="screenshot">The screenshot.</param>
+        /// <param name="path">The path where the image will be saved to.</param>
+        /// <param name="filename">
+        /// The name of the file where the image will be saved to. The extension will be added automatically according to the image path. 
+        /// If no filename is supplied then the original filename from the BrowserStack url will be used.
+        /// </param>
+        /// <param name="overwrite">If set to true then the file will be overwritten, otherwise no attempt will be made to retrieve the file.</param>
+        public void SaveThumbnailToFile(Screenshot screenshot, string path, string filename = null, bool overwrite = false)
+        {
+            var saveThumbnailToFileAsync = SaveThumbnailToFileAsync(screenshot, path, filename, overwrite);
+            saveThumbnailToFileAsync.GetAwaiter().GetResult(); //To properly re-throw an exception: http://stackoverflow.com/questions/20170527/how-to-correctly-rethrow-an-exception-of-task-already-in-faulted-state
+        }
+
         /// <summary>
         /// Starts a BrowserStack screenshot job asynchronously.
         /// </summary>
@@ -305,12 +366,29 @@ public async Task<Job> StartJobAsync(string url, Job.JobInfo jobInfo, bool using
                         string.Format("Error while starting the job.\nResponse status is {0} ({1}).\nResponse is: {2}", response.ReasonPhrase, response.StatusCode, responseString));
                 }
 
-                var screenshotJob = await JsonConvert.DeserializeObjectAsync<ScreenshotJob>(responseString);
+                var screenshotJob = await Task.Factory.StartNew(()=> JsonConvert.DeserializeObject<ScreenshotJob>(responseString));
 
                 return MapToJob(screenshotJob);
             }
         }
 
+        /// <summary>
+        /// Starts a BrowserStack screenshot job synchronously.
+        /// </summary>
+        /// <param name="url">The url for which screenshots are required.</param>
+        /// <param name="jobInfo">The job information that will be used to start the job.</param>
+        /// <param name="usingTunnel">set to <c>true</c> if the BrowserStack jobs need to run under a tunnel. The tunnel must have been initiated externally.</param>
+        /// <param name="browsers">The browsers that will be used to start the job.</param>
+        /// <returns>
+        /// The <see cref="Job" />.
+        /// </returns>
+        /// <exception cref="ApplicationException">Thrown when the call to the BrowserStack API results in an http code other than 200 (OK).</exception>
+        public Job StartJob(string url, Job.JobInfo jobInfo, bool usingTunnel = false, params Browser[] browsers)
+        {
+            var startJobAsync = StartJobAsync(url, jobInfo, usingTunnel, browsers);
+            return startJobAsync.GetAwaiter().GetResult(); //To properly re-throw an exception: http://stackoverflow.com/questions/20170527/how-to-correctly-rethrow-an-exception-of-task-already-in-faulted-state
+        }
+
         #endregion
 
         #region Methods
diff --git a/BrowserStack.API.Screenshots/packages.config b/BrowserStack.API.Screenshots/packages.config
index eaa8556..53836d7 100644
--- a/BrowserStack.API.Screenshots/packages.config
+++ b/BrowserStack.API.Screenshots/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Bcl" version="1.1.6" targetFramework="net45" />
-  <package id="Microsoft.Bcl.Build" version="1.0.13" targetFramework="net45" />
-  <package id="Microsoft.Net.Http" version="2.2.18" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
+  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/BrowserStack.API.ScreenshotsTests/App.config b/BrowserStack.API.ScreenshotsTests/App.config
new file mode 100644
index 0000000..f5c6a4d
--- /dev/null
+++ b/BrowserStack.API.ScreenshotsTests/App.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <section name="BrowserStackAPIScreenshotsSection" type="BrowserStack.API.Screenshots.Configuration.BrowserStackAPIScreenshotsSection,BrowserStack.API.Screenshots" />
+  </configSections>
+  <BrowserStackAPIScreenshotsSection>
+    <Authentication username="" password="" />
+  </BrowserStackAPIScreenshotsSection>
+</configuration>
\ No newline at end of file
diff --git a/BrowserStack.API.ScreenshotsTests/BrowserStack.API.ScreenshotsTests.csproj b/BrowserStack.API.ScreenshotsTests/BrowserStack.API.ScreenshotsTests.csproj
new file mode 100644
index 0000000..bef01be
--- /dev/null
+++ b/BrowserStack.API.ScreenshotsTests/BrowserStack.API.ScreenshotsTests.csproj
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{F3F1F761-0502-40FA-9B66-974088EAF310}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>BrowserStack.API.ScreenshotsTests</RootNamespace>
+    <AssemblyName>BrowserStack.API.ScreenshotsTests</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+  </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>
+  </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>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ScreenshotsApiTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\BrowserStack.API.Screenshots\BrowserStack.API.Screenshots.csproj">
+      <Project>{1025B377-7530-49D0-9C26-4B12B673C331}</Project>
+      <Name>BrowserStack.API.Screenshots</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <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
diff --git a/BrowserStack.API.ScreenshotsTests/Properties/AssemblyInfo.cs b/BrowserStack.API.ScreenshotsTests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..3f8d124
--- /dev/null
+++ b/BrowserStack.API.ScreenshotsTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("BrowserStack.API.ScreenshotsTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("BrowserStack.API.ScreenshotsTests")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("f3f1f761-0502-40fa-9b66-974088eaf310")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/BrowserStack.API.ScreenshotsTests/ScreenshotsApiTests.cs b/BrowserStack.API.ScreenshotsTests/ScreenshotsApiTests.cs
new file mode 100644
index 0000000..c9bb67c
--- /dev/null
+++ b/BrowserStack.API.ScreenshotsTests/ScreenshotsApiTests.cs
@@ -0,0 +1,171 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using BrowserStack.API.Screenshots;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Security.Policy;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using BrowserStack.API.Screenshots.Configuration;
+using System.Configuration;
+
+namespace BrowserStack.API.Screenshots.Tests
+{
+    [TestClass()]
+    public class ScreenshotsApiTests
+    {
+        [TestMethod()]
+        public void HelloWorld()
+        {
+            Assert.IsTrue( true );
+        }
+
+        /// <remarks>MSTest and ReSharper responds with "Inconclusive: Test not run" on all async testmethods due to unknown factors</remarks>>
+        [TestMethod()]
+        public async void HelloWorldAsync()
+        {
+            bool doodle = await Task.Run(()=> true);
+            Assert.IsTrue(doodle);
+        }
+
+        [TestMethod()]
+        public void CustomConfigurationSectionIsPresent()
+        {
+            var section = (BrowserStackAPIScreenshotsSection)ConfigurationManager.GetSection("BrowserStackAPIScreenshotsSection");
+            Assert.IsNotNull(section, "App.Config missing Configuration section BrowserStackAPIScreenshots");
+            Assert.IsNotNull(section.Authentication, "App.Config missing Authentication Element in section BrowserStackAPIScreenshots");
+            Assert.IsFalse(string.IsNullOrWhiteSpace(section.Authentication.Username), "Missing Username in App.Config BrowserStackAPIScreenshots Authentication");
+            Assert.IsFalse(string.IsNullOrWhiteSpace(section.Authentication.Password), "Missing Password in App.Config BrowserStackAPIScreenshots Authentication");
+
+        }
+
+        [TestMethod()]
+        public void RunJob()
+        {
+            var screenshotsAPI = new ScreenshotsApi(); // Config based Authentication
+            //var screenshotsAPI = new ScreenshotsApi(Username, Password); // Alternative
+
+            Assert.IsNotNull(screenshotsAPI);
+
+            var browsers = screenshotsAPI.GetBrowsers();
+            Assert.IsNotNull(browsers);
+
+            var job = screenshotsAPI.StartJob("http://www.google.com", new Job.JobInfo() { Orientation = Job.Orientations.Landscape, Quality = Job.Qualities.Compressed, WaitTime = 10, WinResolution = Job.WinResolutions.R_1280x1024 }, false,
+                    browsers.First(x => x.OS == "Windows" && x.OSVersion == "10" && x.BrowserName == "chrome" && x.BrowserVersion == "49.0"));
+
+            while (!job.IsComplete)
+            {
+                Thread.Sleep(1000);
+                
+                job = screenshotsAPI.GetJobInfo(job.Id);
+                Assert.IsNotNull(job);
+            }
+
+            Assert.IsTrue(job.IsComplete);
+            Assert.IsTrue(job.State == Job.States.Done);
+
+            if (job.State == Job.States.Done)
+            {
+                var screenshot = job.Screenshots.FirstOrDefault(x => x.State == Screenshot.States.Done);
+                Assert.IsNotNull(screenshot);
+                if (screenshot != null)
+                {
+                    if (!System.IO.Directory.Exists("Screenshots")) { System.IO.Directory.CreateDirectory("Screenshots"); }
+                    screenshotsAPI.SaveScreenshotToFile(screenshot, "Screenshots", "screenshot", true);
+                    screenshotsAPI.SaveThumbnailToFile(screenshot, "Screenshots", "screenshot-thumbnail", true);
+                    Process.Start(System.IO.Path.GetFullPath("Screenshots/screenshot.png"));
+                }
+            }    
+        }
+
+        [TestMethod()]
+        public async void RunJobAsync()
+        {
+            var screenshotsAPI = new ScreenshotsApi();
+            var browsers = await screenshotsAPI.GetBrowsersAsync();
+
+            var job = await screenshotsAPI.StartJobAsync("http://www.google.com", new Job.JobInfo(), false,
+                    browsers.First(x => x.OS == "Windows" && x.OSVersion == "10" && x.BrowserName == "firefox" && x.BrowserVersion == "45.0"));
+
+            while (!job.IsComplete)
+            {
+                Thread.Sleep(1000);
+                job = screenshotsAPI.GetJobInfoAsync(job.Id).Result;
+            }
+
+            if (job.State == Job.States.Done)
+            {
+                var screenshot = job.Screenshots.FirstOrDefault(x => x.State == Screenshot.States.Done);
+                Assert.IsNotNull(screenshot);
+                if (screenshot != null)
+                {
+                    if (!System.IO.Directory.Exists("Screenshots")) { System.IO.Directory.CreateDirectory("Screenshots"); }
+                    await screenshotsAPI.SaveScreenshotToFileAsync(screenshot, "Screenshots", "screenshot", true);
+                    Process.Start(System.IO.Path.GetFullPath("Screenshots/screenshot.png"));   
+                }
+            }
+        }
+
+        [TestMethod()]
+        public void RunBatch()
+        {
+            var screenshotsAPI = new ScreenshotsApi();
+
+            var browsers = screenshotsAPI.GetBrowsers();
+            Assert.IsNotNull(browsers);
+
+            var batchCaptureJobForWindows = new BatchCaptureJobInfo(
+                url: "http://www.google.com",
+                filenameTemplate: "google",
+                jobInfo: new Job.JobInfo() { WinResolution = Job.WinResolutions.R_1280x1024 },
+                browsers: browsers.Where(x => x.OS == "Windows" && x.OSVersion == "10" && x.BrowserName == "firefox" && x.BrowserVersion == "45.0").ToArray());
+
+            var batchCaptureJobForDevices = new BatchCaptureJobInfo(
+                    url: "http://www.bing.com",
+                    filenameTemplate: "bing",
+                    jobInfo: new Job.JobInfo() { Orientation = Job.Orientations.Portrait },
+                    browsers: browsers.Where(x => x.Device == "HTC One M8").ToArray());
+
+            var capturer = new BatchScreenshotsCapture(1, false);
+
+            if (System.IO.Directory.Exists("Screenshots")) { System.IO.Directory.Delete("Screenshots", true); }
+            System.IO.Directory.CreateDirectory("Screenshots");
+
+            capturer.ExecuteBatch("Screenshots-" + DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss", CultureInfo.InvariantCulture), false, batchCaptureJobForWindows, batchCaptureJobForDevices);
+            Process.Start(System.IO.Path.GetFullPath("Screenshots"));
+        }
+
+        [TestMethod()]
+        public async void RunBatchAsync()
+        {
+            var screenshotsAPI = new ScreenshotsApi();
+
+            var browsers = await screenshotsAPI.GetBrowsersAsync();
+
+            var batchCaptureJobForWindows = new BatchCaptureJobInfo(
+                url: "http://www.google.com",
+                filenameTemplate: "google",
+                jobInfo: new Job.JobInfo() { WinResolution = Job.WinResolutions.R_1280x1024 },
+                browsers: browsers.Where(x => x.OS == "Windows" && x.OSVersion == "10" && x.BrowserName == "firefox" && x.BrowserVersion == "45.0").ToArray());
+
+            var batchCaptureJobForDevices = new BatchCaptureJobInfo(
+                    url: "http://www.bing.com",
+                    filenameTemplate: "bing",
+                    jobInfo: new Job.JobInfo() { Orientation = Job.Orientations.Portrait },
+                    browsers: browsers.Where(x => x.Device == "HTC One M8").ToArray());
+
+            var capturer = new BatchScreenshotsCapture(1, false);
+
+            if (System.IO.Directory.Exists("Screenshots")) { System.IO.Directory.Delete("Screenshots", true); }
+            System.IO.Directory.CreateDirectory("Screenshots");
+
+            await capturer.ExecuteBatchAsync("Screenshots-" + DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss", CultureInfo.InvariantCulture), false, batchCaptureJobForWindows, batchCaptureJobForDevices);
+            Process.Start(System.IO.Path.GetFullPath("Screenshots"));
+        }
+
+
+    }
+}
\ No newline at end of file