diff --git a/Examples/ExampleCommon/ExampleCommon.csproj b/Examples/ExampleCommon/ExampleCommon.csproj
index 2b699a6e..988eaf17 100644
--- a/Examples/ExampleCommon/ExampleCommon.csproj
+++ b/Examples/ExampleCommon/ExampleCommon.csproj
@@ -33,6 +33,26 @@
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -56,4 +76,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Examples/ExampleInceptionInference/ExampleInceptionInference.csproj b/Examples/ExampleInceptionInference/ExampleInceptionInference.csproj
index 9ac2c094..c1199bf0 100644
--- a/Examples/ExampleInceptionInference/ExampleInceptionInference.csproj
+++ b/Examples/ExampleInceptionInference/ExampleInceptionInference.csproj
@@ -29,6 +29,24 @@
     <ExternalConsole>true</ExternalConsole>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Mono.Options">
diff --git a/Examples/ExampleObjectDetection/ExampleObjectDetection.csproj b/Examples/ExampleObjectDetection/ExampleObjectDetection.csproj
index fe9c98e4..3977bcc9 100644
--- a/Examples/ExampleObjectDetection/ExampleObjectDetection.csproj
+++ b/Examples/ExampleObjectDetection/ExampleObjectDetection.csproj
@@ -33,6 +33,26 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
diff --git a/Examples/FExampleInceptionInference/FSharpExampleInceptionInference.fsproj b/Examples/FExampleInceptionInference/FSharpExampleInceptionInference.fsproj
index 2355a4f6..386ecad6 100644
--- a/Examples/FExampleInceptionInference/FSharpExampleInceptionInference.fsproj
+++ b/Examples/FExampleInceptionInference/FSharpExampleInceptionInference.fsproj
@@ -23,7 +23,8 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
-    <DefineConstants></DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <ExternalConsole>true</ExternalConsole>
     <GenerateTailCalls>true</GenerateTailCalls>
@@ -35,6 +36,25 @@
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0' OR '$(VisualStudioVersion)' == '11.0'">
     <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <ExternalConsole>true</ExternalConsole>
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <DefineConstants />
+    <ErrorReport>prompt</ErrorReport>
+    <ExternalConsole>true</ExternalConsole>
+    <GenerateTailCalls>true</GenerateTailCalls>
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="FSharp.Core" />
@@ -67,4 +87,4 @@
       </Properties>
     </MonoDevelop>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Examples/ImageCompression/ImageCompression.fsproj b/Examples/ImageCompression/ImageCompression.fsproj
index f463453d..715f0e6e 100644
--- a/Examples/ImageCompression/ImageCompression.fsproj
+++ b/Examples/ImageCompression/ImageCompression.fsproj
@@ -23,7 +23,8 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
-    <DefineConstants></DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <ExternalConsole>true</ExternalConsole>
     <GenerateTailCalls>true</GenerateTailCalls>
@@ -35,6 +36,25 @@
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0' OR '$(VisualStudioVersion)' == '11.0'">
     <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <ExternalConsole>true</ExternalConsole>
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <DefineConstants />
+    <ErrorReport>prompt</ErrorReport>
+    <ExternalConsole>true</ExternalConsole>
+    <GenerateTailCalls>true</GenerateTailCalls>
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="FSharp.Core" />
@@ -55,4 +75,4 @@
     </Content>
   </ItemGroup>
   <Import Project="$(FSharpTargetsPath)" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Learn/Learn.csproj b/Learn/Learn.csproj
index febbe952..a8744fed 100644
--- a/Learn/Learn.csproj
+++ b/Learn/Learn.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -29,6 +29,24 @@
     <ConsolePause>false</ConsolePause>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
@@ -43,9 +61,7 @@
     <Compile Include="Datasets\Helper.cs" />
     <Compile Include="DataConverter.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Datasets\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\TensorFlowSharp\TensorFlowSharp.csproj">
       <Project>{0264C321-34F4-46AF-819E-168D1E597232}</Project>
diff --git a/OpGenerator/OpGenerator.csproj b/OpGenerator/OpGenerator.csproj
index 18b3a006..16aae916 100644
--- a/OpGenerator/OpGenerator.csproj
+++ b/OpGenerator/OpGenerator.csproj
@@ -31,6 +31,26 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
diff --git a/SampleTest/SampleTest.csproj b/SampleTest/SampleTest.csproj
index 123c35a1..891089a9 100644
--- a/SampleTest/SampleTest.csproj
+++ b/SampleTest/SampleTest.csproj
@@ -31,6 +31,29 @@
     <PlatformTarget>x64</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
diff --git a/TensorFlowSharp.sln b/TensorFlowSharp.sln
index 84fa2403..67ca6159 100644
--- a/TensorFlowSharp.sln
+++ b/TensorFlowSharp.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26430.14
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TensorFlowSharp", "TensorFlowSharp\TensorFlowSharp.csproj", "{0264C321-34F4-46AF-819E-168D1E597232}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowSharp", "TensorFlowSharp\TensorFlowSharp.csproj", "{0264C321-34F4-46AF-819E-168D1E597232}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleTest", "SampleTest\SampleTest.csproj", "{243E2C90-F465-4A6E-9063-8F2C138015C7}"
 EndProject
@@ -12,15 +12,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Learn", "Learn\Learn.csproj
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleInceptionInference", "Examples\ExampleInceptionInference\ExampleInceptionInference.csproj", "{069A6736-7711-4805-8660-A267E713BC54}"
 EndProject
-Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "FSharpExampleInceptionInference", "Examples\FExampleInceptionInference\FSharpExampleInceptionInference.fsproj", "{03FB7F3A-6D24-4033-9B04-69AD8A198CCF}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpExampleInceptionInference", "Examples\FExampleInceptionInference\FSharpExampleInceptionInference.fsproj", "{03FB7F3A-6D24-4033-9B04-69AD8A198CCF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{674EC1D7-9649-462E-A7A8-93D0DE84FE64}"
 EndProject
-Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "ImageCompression", "Examples\ImageCompression\ImageCompression.fsproj", "{5A493E1F-407D-4A3B-AF9B-A0F2930C1C18}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ImageCompression", "Examples\ImageCompression\ImageCompression.fsproj", "{5A493E1F-407D-4A3B-AF9B-A0F2930C1C18}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6E72CAD1-7962-4256-AF2A-3B813FFC88EA}"
 EndProject
-Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "TensorFlowSharp.Tests", "tests\TensorFlowSharp.Tests\TensorFlowSharp.Tests.fsproj", "{9EE13143-569F-4F7A-975A-DE7DF5C8FF0B}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TensorFlowSharp.Tests", "tests\TensorFlowSharp.Tests\TensorFlowSharp.Tests.fsproj", "{9EE13143-569F-4F7A-975A-DE7DF5C8FF0B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TensorFlowSharp.Tests.CSharp", "tests\TensorFlowSharp.Tests.CSharp\TensorFlowSharp.Tests.CSharp.csproj", "{6504A704-575C-48D0-A4D2-422A7010936B}"
 EndProject
@@ -36,53 +36,99 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0264C321-34F4-46AF-819E-168D1E597232}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0264C321-34F4-46AF-819E-168D1E597232}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0264C321-34F4-46AF-819E-168D1E597232}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{0264C321-34F4-46AF-819E-168D1E597232}.Debug|Any CPU.Build.0 = Debug|x64
+		{0264C321-34F4-46AF-819E-168D1E597232}.Debug|x64.ActiveCfg = Debug|x64
+		{0264C321-34F4-46AF-819E-168D1E597232}.Debug|x64.Build.0 = Debug|x64
 		{0264C321-34F4-46AF-819E-168D1E597232}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0264C321-34F4-46AF-819E-168D1E597232}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0264C321-34F4-46AF-819E-168D1E597232}.Release|x64.ActiveCfg = Release|x64
+		{0264C321-34F4-46AF-819E-168D1E597232}.Release|x64.Build.0 = Release|x64
 		{243E2C90-F465-4A6E-9063-8F2C138015C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{243E2C90-F465-4A6E-9063-8F2C138015C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{243E2C90-F465-4A6E-9063-8F2C138015C7}.Debug|x64.ActiveCfg = Debug|x64
+		{243E2C90-F465-4A6E-9063-8F2C138015C7}.Debug|x64.Build.0 = Debug|x64
 		{243E2C90-F465-4A6E-9063-8F2C138015C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{243E2C90-F465-4A6E-9063-8F2C138015C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{243E2C90-F465-4A6E-9063-8F2C138015C7}.Release|x64.ActiveCfg = Release|x64
+		{243E2C90-F465-4A6E-9063-8F2C138015C7}.Release|x64.Build.0 = Release|x64
 		{700E5928-3D5D-4B54-AD4D-BC48E79E389E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{700E5928-3D5D-4B54-AD4D-BC48E79E389E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{700E5928-3D5D-4B54-AD4D-BC48E79E389E}.Debug|x64.ActiveCfg = Debug|x64
+		{700E5928-3D5D-4B54-AD4D-BC48E79E389E}.Debug|x64.Build.0 = Debug|x64
 		{700E5928-3D5D-4B54-AD4D-BC48E79E389E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{700E5928-3D5D-4B54-AD4D-BC48E79E389E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{700E5928-3D5D-4B54-AD4D-BC48E79E389E}.Release|x64.ActiveCfg = Release|x64
+		{700E5928-3D5D-4B54-AD4D-BC48E79E389E}.Release|x64.Build.0 = Release|x64
 		{20567EDE-7C20-4734-B489-C6D303843105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{20567EDE-7C20-4734-B489-C6D303843105}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20567EDE-7C20-4734-B489-C6D303843105}.Debug|x64.ActiveCfg = Debug|x64
+		{20567EDE-7C20-4734-B489-C6D303843105}.Debug|x64.Build.0 = Debug|x64
 		{20567EDE-7C20-4734-B489-C6D303843105}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{20567EDE-7C20-4734-B489-C6D303843105}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20567EDE-7C20-4734-B489-C6D303843105}.Release|x64.ActiveCfg = Release|x64
+		{20567EDE-7C20-4734-B489-C6D303843105}.Release|x64.Build.0 = Release|x64
 		{069A6736-7711-4805-8660-A267E713BC54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{069A6736-7711-4805-8660-A267E713BC54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{069A6736-7711-4805-8660-A267E713BC54}.Debug|x64.ActiveCfg = Debug|x64
+		{069A6736-7711-4805-8660-A267E713BC54}.Debug|x64.Build.0 = Debug|x64
 		{069A6736-7711-4805-8660-A267E713BC54}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{069A6736-7711-4805-8660-A267E713BC54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{069A6736-7711-4805-8660-A267E713BC54}.Release|x64.ActiveCfg = Release|x64
+		{069A6736-7711-4805-8660-A267E713BC54}.Release|x64.Build.0 = Release|x64
 		{03FB7F3A-6D24-4033-9B04-69AD8A198CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{03FB7F3A-6D24-4033-9B04-69AD8A198CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03FB7F3A-6D24-4033-9B04-69AD8A198CCF}.Debug|x64.ActiveCfg = Debug|x64
+		{03FB7F3A-6D24-4033-9B04-69AD8A198CCF}.Debug|x64.Build.0 = Debug|x64
 		{03FB7F3A-6D24-4033-9B04-69AD8A198CCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{03FB7F3A-6D24-4033-9B04-69AD8A198CCF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03FB7F3A-6D24-4033-9B04-69AD8A198CCF}.Release|x64.ActiveCfg = Release|x64
+		{03FB7F3A-6D24-4033-9B04-69AD8A198CCF}.Release|x64.Build.0 = Release|x64
 		{5A493E1F-407D-4A3B-AF9B-A0F2930C1C18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5A493E1F-407D-4A3B-AF9B-A0F2930C1C18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A493E1F-407D-4A3B-AF9B-A0F2930C1C18}.Debug|x64.ActiveCfg = Debug|x64
+		{5A493E1F-407D-4A3B-AF9B-A0F2930C1C18}.Debug|x64.Build.0 = Debug|x64
 		{5A493E1F-407D-4A3B-AF9B-A0F2930C1C18}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A493E1F-407D-4A3B-AF9B-A0F2930C1C18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A493E1F-407D-4A3B-AF9B-A0F2930C1C18}.Release|x64.ActiveCfg = Release|x64
+		{5A493E1F-407D-4A3B-AF9B-A0F2930C1C18}.Release|x64.Build.0 = Release|x64
 		{9EE13143-569F-4F7A-975A-DE7DF5C8FF0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9EE13143-569F-4F7A-975A-DE7DF5C8FF0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EE13143-569F-4F7A-975A-DE7DF5C8FF0B}.Debug|x64.ActiveCfg = Debug|x64
+		{9EE13143-569F-4F7A-975A-DE7DF5C8FF0B}.Debug|x64.Build.0 = Debug|x64
 		{9EE13143-569F-4F7A-975A-DE7DF5C8FF0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9EE13143-569F-4F7A-975A-DE7DF5C8FF0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6504A704-575C-48D0-A4D2-422A7010936B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6504A704-575C-48D0-A4D2-422A7010936B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EE13143-569F-4F7A-975A-DE7DF5C8FF0B}.Release|x64.ActiveCfg = Release|x64
+		{9EE13143-569F-4F7A-975A-DE7DF5C8FF0B}.Release|x64.Build.0 = Release|x64
+		{6504A704-575C-48D0-A4D2-422A7010936B}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{6504A704-575C-48D0-A4D2-422A7010936B}.Debug|Any CPU.Build.0 = Debug|x64
+		{6504A704-575C-48D0-A4D2-422A7010936B}.Debug|x64.ActiveCfg = Debug|x64
+		{6504A704-575C-48D0-A4D2-422A7010936B}.Debug|x64.Build.0 = Debug|x64
 		{6504A704-575C-48D0-A4D2-422A7010936B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6504A704-575C-48D0-A4D2-422A7010936B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6504A704-575C-48D0-A4D2-422A7010936B}.Release|x64.ActiveCfg = Release|x64
+		{6504A704-575C-48D0-A4D2-422A7010936B}.Release|x64.Build.0 = Release|x64
 		{69471B59-576D-446B-8DF3-96EC783C0B6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{69471B59-576D-446B-8DF3-96EC783C0B6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69471B59-576D-446B-8DF3-96EC783C0B6C}.Debug|x64.ActiveCfg = Debug|x64
+		{69471B59-576D-446B-8DF3-96EC783C0B6C}.Debug|x64.Build.0 = Debug|x64
 		{69471B59-576D-446B-8DF3-96EC783C0B6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{69471B59-576D-446B-8DF3-96EC783C0B6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69471B59-576D-446B-8DF3-96EC783C0B6C}.Release|x64.ActiveCfg = Release|x64
+		{69471B59-576D-446B-8DF3-96EC783C0B6C}.Release|x64.Build.0 = Release|x64
 		{116BA176-F67C-4066-8685-C080705BAA16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{116BA176-F67C-4066-8685-C080705BAA16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{116BA176-F67C-4066-8685-C080705BAA16}.Debug|x64.ActiveCfg = Debug|x64
+		{116BA176-F67C-4066-8685-C080705BAA16}.Debug|x64.Build.0 = Debug|x64
 		{116BA176-F67C-4066-8685-C080705BAA16}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{116BA176-F67C-4066-8685-C080705BAA16}.Release|Any CPU.Build.0 = Release|Any CPU
+		{116BA176-F67C-4066-8685-C080705BAA16}.Release|x64.ActiveCfg = Release|x64
+		{116BA176-F67C-4066-8685-C080705BAA16}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/TensorFlowSharp/TensorFlowSharp.csproj b/TensorFlowSharp/TensorFlowSharp.csproj
index db25f507..038b09ec 100644
--- a/TensorFlowSharp/TensorFlowSharp.csproj
+++ b/TensorFlowSharp/TensorFlowSharp.csproj
@@ -10,6 +10,7 @@
     <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
     <ReleaseVersion>0.1</ReleaseVersion>
     <TensorFlowRuntimeVersion>1.15.0</TensorFlowRuntimeVersion>
+    <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/tests/TensorFlowSharp.Tests.CSharp/MathTests.cs b/tests/TensorFlowSharp.Tests.CSharp/MathTests.cs
index b3686c34..52c4f158 100644
--- a/tests/TensorFlowSharp.Tests.CSharp/MathTests.cs
+++ b/tests/TensorFlowSharp.Tests.CSharp/MathTests.cs
@@ -10,7 +10,31 @@ namespace TensorFlowSharp.Tests.CSharp
 {
 	public class MathTests
 	{
-		[Fact]
+        private static IEnumerable<object[]> atanData1()
+        {
+            var x = new double[] { 1.731261, 1 };
+            var expected = new double[] { 1.04700003, 0.78539816 };
+            yield return new object[] { x, expected};
+        }
+
+        [Theory]
+        [MemberData(nameof(atanData1))]
+        public void ShouldAtan(double[] x, double[] expected)
+        {
+            using (var graph = new TFGraph())
+            using (var session = new TFSession(graph))
+            {
+                var tX = graph.Placeholder(TFDataType.Double, new TFShape(2));
+                var actual = graph.Atan(tX);
+
+                var result = (double[])session.Run(new[] { tX }, new TFTensor[] { x }, new[] { actual })[0].GetValue();
+
+                TestUtils.MatrixEqual(expected, result, 8);
+            }
+
+        }
+
+        [Fact]
 		public void Should_CalculateTanhGrad_Correctly ()
 		{
 			using (TFGraph graph = new TFGraph ())
diff --git a/tests/TensorFlowSharp.Tests.CSharp/TensorFlowSharp.Tests.CSharp.csproj b/tests/TensorFlowSharp.Tests.CSharp/TensorFlowSharp.Tests.CSharp.csproj
index 2af4d6b1..8362132a 100644
--- a/tests/TensorFlowSharp.Tests.CSharp/TensorFlowSharp.Tests.CSharp.csproj
+++ b/tests/TensorFlowSharp.Tests.CSharp/TensorFlowSharp.Tests.CSharp.csproj
@@ -38,6 +38,24 @@
     <AssemblyName>
     </AssemblyName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.DotNet.InternalAbstractions, Version=1.0.500.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.DotNet.InternalAbstractions.1.0.500-preview2-1-003177\lib\net451\Microsoft.DotNet.InternalAbstractions.dll</HintPath>
diff --git a/tests/TensorFlowSharp.Tests/TensorFlowSharp.Tests.fsproj b/tests/TensorFlowSharp.Tests/TensorFlowSharp.Tests.fsproj
index 47b387fd..992aa4e6 100644
--- a/tests/TensorFlowSharp.Tests/TensorFlowSharp.Tests.fsproj
+++ b/tests/TensorFlowSharp.Tests/TensorFlowSharp.Tests.fsproj
@@ -40,6 +40,27 @@
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <Tailcalls>false</Tailcalls>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\Debug\TensorFlowSharp.Tests.XML</DocumentationFile>
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\Release\TensorFlowSharp.Tests.XML</DocumentationFile>
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '11.0'">
       <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">