diff --git a/IntentoSDK/Handlers/BaseSymbolHandler.cs b/IntentoSDK/Handlers/BaseSymbolHandler.cs
new file mode 100644
index 0000000..605f527
--- /dev/null
+++ b/IntentoSDK/Handlers/BaseSymbolHandler.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntentoSDK.Handlers
+{
+    /// <summary>
+    /// Base symbol handler
+    /// </summary>
+    public abstract class BaseSymbolHandler : ISymbolHandler
+    {
+        protected abstract IReadOnlyDictionary<string, string> SpecialCodesIn { get; }
+
+        protected abstract IReadOnlyDictionary<string, string> SpecialCodesOut { get; }
+
+        public abstract string Format { get; }
+
+        public virtual string OnResponsing(string text)
+        {
+            return PrepareResult(text);
+        }
+
+        public virtual string OnSending(string text)
+        {
+            return PrepareText(text);
+        }
+
+        protected virtual string PrepareText(string data)
+        {
+            // Remove parasite character for memoq
+            data = new string(data.Where(c => (int)c != 9727).ToArray());
+
+            // Replacing some HTML codes with special tags
+            foreach (KeyValuePair<string, string> pair in SpecialCodesIn)
+            {
+                data = data.Replace(pair.Key, pair.Value);
+            }            
+            return data;
+        }
+
+        protected virtual string PrepareResult(string text)
+        {
+            // Return HTML codes instead of special tags
+            foreach (KeyValuePair<string, string> pair in SpecialCodesOut)
+            {
+                text = text.Replace(pair.Key, pair.Value);
+            }
+            
+            return text;
+        }
+
+    }
+}
diff --git a/IntentoSDK/Handlers/HtmlSymbolHandler.cs b/IntentoSDK/Handlers/HtmlSymbolHandler.cs
new file mode 100644
index 0000000..fddda60
--- /dev/null
+++ b/IntentoSDK/Handlers/HtmlSymbolHandler.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntentoSDK.Handlers
+{
+    /// <summary>
+    /// Prepare HTML text
+    /// </summary>
+    internal class HtmlSymbolHandler : BaseSymbolHandler
+    {
+        protected override IReadOnlyDictionary<string, string> SpecialCodesIn => new Dictionary<string, string>();
+
+        protected override IReadOnlyDictionary<string, string> SpecialCodesOut => 
+            new Dictionary<string, string> 
+            {
+                { "&lt;", "<" },
+                { "&gt;", ">" }
+            };
+
+        public override string Format => "html";
+
+        protected override string PrepareResult(string text)
+        {
+            text = base.PrepareResult(text);
+
+            // Remove <meta> and </meta> tags
+            int n1 = text.IndexOf("<meta");
+            string text2 = text;
+            if (n1 != -1)
+            {
+                int n2 = text.IndexOf(">");
+                text2 = text.Substring(n2 + 1);
+            }
+            return text2;
+        }
+    }
+}
diff --git a/IntentoSDK/Handlers/ISymbolHandler.cs b/IntentoSDK/Handlers/ISymbolHandler.cs
new file mode 100644
index 0000000..31d3f8f
--- /dev/null
+++ b/IntentoSDK/Handlers/ISymbolHandler.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntentoSDK.Handlers
+{
+    /// <summary>
+    /// Process text before and after sending
+    /// </summary>
+    public interface ISymbolHandler
+    {
+        /// <summary>
+        /// Type of text format
+        /// </summary>
+        string Format { get; }
+
+        /// <summary>
+        /// Prepare text before send
+        /// </summary>
+        /// <param name="text">Text</param>
+        /// <returns></returns>
+        string OnSending(string text);
+
+        /// <summary>
+        /// Prepare text after send
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        string OnResponsing(string text);
+    }
+}
diff --git a/IntentoSDK/Handlers/SymbolHandlersFactory.cs b/IntentoSDK/Handlers/SymbolHandlersFactory.cs
new file mode 100644
index 0000000..291f441
--- /dev/null
+++ b/IntentoSDK/Handlers/SymbolHandlersFactory.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntentoSDK.Handlers
+{
+    /// <summary>
+    /// Factory for handlers
+    /// </summary>
+    public class SymbolHandlersFactory
+    {
+        private readonly ISymbolHandler[] symbolHandlers;
+
+        /// <summary>
+        /// Ctor
+        /// </summary>
+        public SymbolHandlersFactory()
+        {
+            symbolHandlers = new ISymbolHandler[] {
+                new XmlSymbolHandler(),
+                new HtmlSymbolHandler()
+            };
+        }
+
+        /// <summary>
+        /// Prepare source
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="format"></param>
+        /// <returns></returns>
+        public string HandleSource(string text, string format)
+        {
+            foreach (ISymbolHandler handler in symbolHandlers.Where(h => h.Format == format))
+            {
+                text = handler.OnSending(text);
+            }
+            return text;
+        }
+
+        /// <summary>
+        /// Prepare result
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="format"></param>
+        /// <returns></returns>
+        public string HandleResult(string text, string format)
+        {
+            foreach (ISymbolHandler handler in symbolHandlers.Where(h => h.Format == format))
+            {
+                text = handler.OnResponsing(text);
+            }
+            return text;
+        }
+
+        private static readonly SymbolHandlersFactory current = new SymbolHandlersFactory();
+
+        /// <summary>
+        /// Current instance of factory
+        /// </summary>
+        public static SymbolHandlersFactory Current => current;
+        
+    }
+}
diff --git a/IntentoSDK/Handlers/XmlSymbolHandler.cs b/IntentoSDK/Handlers/XmlSymbolHandler.cs
new file mode 100644
index 0000000..35c6abc
--- /dev/null
+++ b/IntentoSDK/Handlers/XmlSymbolHandler.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntentoSDK.Handlers
+{
+    /// <summary>
+    /// Xml symbols prepare
+    /// </summary>
+    internal class XmlSymbolHandler : BaseSymbolHandler
+    {
+        protected override IReadOnlyDictionary<string, string> SpecialCodesIn => new Dictionary<string, string>
+         {
+           { "&amp;gt;" ,   "<tph1/>" },
+           { "&amp;lt;" ,   "<tph2/>" },
+           { "&lt;"     ,   "<tph3/>" },
+           { "&gt;"     ,   "<tph4/>" }
+         };
+
+        protected override IReadOnlyDictionary<string, string> SpecialCodesOut => new Dictionary<string, string>
+        {
+           { "<tph1>" ,   "&amp;gt;"  },
+           { "<tph2>" ,   "&amp;lt;"  },
+           { "<tph3>" ,   "&lt;"      },
+           { "<tph4>" ,   "&gt;"      },
+           { "<tph1/>",   "&amp;gt;"  },
+           { "<tph2/>",   "&amp;lt;"  },
+           { "<tph3/>",   "&lt;"      },
+           { "<tph4/>",   "&gt;"      },
+           { "<tph1 />",  "&amp;gt;"  },
+           { "<tph2 />",  "&amp;lt;"  },
+           { "<tph3 />",  "&lt;"      },
+           { "<tph4 />",  "&gt;"      },
+           { "</tph1>",   ""          },
+           { "</tph2>",   ""          },
+           { "</tph3>",   ""          },
+           { "</tph4>",   ""          }
+        };
+
+        public override string Format => "xml";
+
+        protected override string PrepareResult(string text)
+        {
+            text = base.PrepareResult(text);
+
+            // Remove <? > tag
+            int n1 = text.IndexOf("<?");
+            string text2 = text;
+            if (n1 != -1)
+            {
+                int n2 = text.IndexOf(">");
+                text2 = text.Substring(n2 + 1);
+            }
+
+            // Remove <root> and </root> tags
+            string text3 = text2.Replace("<root>", "").Replace("</root>", "");
+            return text3;
+        }
+
+        protected override string PrepareText(string data)
+        {
+            data = base.PrepareText(data);
+            return string.Format("<root>{0}</root>", data);
+        }
+    }
+}
diff --git a/IntentoSDK/HttpConnector.cs b/IntentoSDK/HttpConnector.cs
index 73af453..fd3f559 100644
--- a/IntentoSDK/HttpConnector.cs
+++ b/IntentoSDK/HttpConnector.cs
@@ -46,14 +46,15 @@ public HttpConnector(Intento _intento)
             client.DefaultRequestHeaders.Add("User-Agent", userAgent);
         }
 
-        async public Task<dynamic> PostAsync(string path, dynamic json, Dictionary<string, string> special_headers = null, Dictionary<string, string> additionalParams = null)
+        async public Task<dynamic> PostAsync(string path, dynamic json, Dictionary<string, string> special_headers = null, 
+											Dictionary<string, string> additionalParams = null, bool useSyncwrapper = false)
         {
             try
             {
                 string jsonData = JsonConvert.SerializeObject(json);
                 using (HttpContent httpContent = new StringContent(jsonData))
                 {
-                    var url = MakeUrl(path, additionalParams);
+                    var url = MakeUrl(path, additionalParams, useSyncwrapper);
                     if (special_headers != null && special_headers.Count != 0)
                     {
                         foreach (KeyValuePair<string, string> pair in special_headers)
@@ -112,12 +113,13 @@ async public Task<dynamic> GetAsync(string path, Dictionary<string, string> addi
             }
         }
 
-        private string MakeUrl(string path, Dictionary<string, string> additionalParams)
+        private string MakeUrl(string path, Dictionary<string, string> additionalParams, bool useSyncwrapper = false)
         {
-            if (additionalParams == null)
-                return intento.serverUrl + path;
+			string url = useSyncwrapper ? intento.syncwrapperUrl : intento.serverUrl;
+			if (additionalParams == null)
+                return url + path;
 
-            UriBuilder uri = new UriBuilder(intento.serverUrl + path);
+            UriBuilder uri = new UriBuilder(url + path);
             System.Collections.Specialized.NameValueCollection query = HttpUtility.ParseQueryString(uri.Query);
             foreach (KeyValuePair<string, string> pair in additionalParams)
                 query[pair.Key] = pair.Value;
diff --git a/IntentoSDK/Intento.cs b/IntentoSDK/Intento.cs
index c6e4049..78af3d8 100644
--- a/IntentoSDK/Intento.cs
+++ b/IntentoSDK/Intento.cs
@@ -54,8 +54,9 @@ public class Intento
     {
         internal string apiKey;
         internal Dictionary<string, object> auth;
-        internal string serverUrl;
-        internal string otherUserAgent;
+		internal string serverUrl;
+		internal string syncwrapperUrl;
+		internal string otherUserAgent;
         internal string version;
         internal Action<string, string, Exception> loggingCallback;
         internal int waitAsyncDelay = 0;
@@ -81,7 +82,10 @@ private Intento(
             this.apiKey = apiKey;
             this.auth = auth != null ? new Dictionary<string, object>(auth) : null;
             this.serverUrl = string.IsNullOrEmpty(path) ? "https://api.inten.to/" : path;
-            otherUserAgent = userAgent;
+			// path can be https://api2.inten.to/
+			// this.syncwrapperUrl = this.serverUrl.Replace("https://api", "https://syncwrapper-memoq");
+			this.syncwrapperUrl = "https://syncwrapper-memoq.inten.to/";
+			otherUserAgent = userAgent;
             System.Net.ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12;
             this.waitAsyncDelay = waitAsyncDelay;
 
diff --git a/IntentoSDK/IntentoAiTextTranslate.cs b/IntentoSDK/IntentoAiTextTranslate.cs
index 882c09d..3af9a85 100644
--- a/IntentoSDK/IntentoAiTextTranslate.cs
+++ b/IntentoSDK/IntentoAiTextTranslate.cs
@@ -30,13 +30,14 @@ public dynamic Fulfill(object text, string to, string from = null, string provid
             string custom_model = null, string glossary = null,
             object pre_processing = null, object post_processing = null,
             bool failover = false, object failover_list = null, string routing = null, bool trace = false,
-            Dictionary<string, string> special_headers = null)
+            Dictionary<string, string> special_headers = null, bool useSyncwrapper = false)
         {
             Task<dynamic> taskReadResult = Task.Run<dynamic>(async () => await this.FulfillAsync(text, to, from: from, provider: provider,
                 async: async, wait_async: wait_async, format: format, auth: auth,
                 custom_model: custom_model, glossary: glossary,
                 pre_processing: pre_processing, post_processing: post_processing,
-                failover: failover, failover_list: failover_list, routing: routing, trace: trace, special_headers: special_headers));
+                failover: failover, failover_list: failover_list, routing: routing, trace: trace,
+				special_headers: special_headers, useSyncwrapper: useSyncwrapper));
             return taskReadResult.Result;
         }
 
@@ -45,7 +46,7 @@ async public Task<dynamic> FulfillAsync(object text, string to, string from = nu
             string custom_model = null, string glossary = null,
             object pre_processing = null, object post_processing = null,
             bool failover = false, object failover_list = null, string routing = null, bool trace = false,
-            Dictionary<string, string> special_headers = null)
+            Dictionary<string, string> special_headers = null, bool useSyncwrapper = false)
         {
             dynamic preProcessingJson = GetJson(pre_processing, "pre_processing");
             dynamic postProcessingJson = GetJson(post_processing, "post_processing");
@@ -55,16 +56,33 @@ async public Task<dynamic> FulfillAsync(object text, string to, string from = nu
             // ------ context section
             dynamic context = new JObject();
 
-            // text
-            if (text == null)
-                context.text = "";
-            else if (text is IEnumerable<string>)
-                context.text = GetJson(((IEnumerable<string>)text).Select(i => i == null ? "" : i), "text");
-            else
-                context.text = GetJson(text.ToString(), "text") ?? "";
+			int textLength = 0;
+			// text
+			if (text == null)
+				context.text = "";
+			else if (text is IEnumerable<string>)
+			{
+				context.text = GetJson(((IEnumerable<string>)text).Select(i => i == null ? "" : i), "text");
+				textLength = ((IEnumerable<string>)text).Where(x => x != null).Sum(i => i.Length);
+			}
+			else
+			{
+				context.text = GetJson(text.ToString(), "text") ?? "";
+				textLength = ((string)text).Length;
+			}
 
-            // to
-            context.to = to;
+			// determination of the possibility of using the syncwrapper
+			// maximum 10k characters
+			if (useSyncwrapper)
+			{
+				if (textLength < 10000)
+					async = !useSyncwrapper;
+				else
+					useSyncwrapper = false;
+			}
+
+			// to
+			context.to = to;
 
             // from
             if (!string.IsNullOrWhiteSpace(from))
@@ -91,9 +109,9 @@ async public Task<dynamic> FulfillAsync(object text, string to, string from = nu
             if (!string.IsNullOrWhiteSpace(provider))
                 service.provider = provider;
 
-            // async parameter
-            if (async)
-                service.async = true;
+			// async parameter
+			if (async)
+				service.async = true;
 
             // auth parameter
             service.auth = GetJson(auth, "auth");
@@ -141,7 +159,7 @@ async public Task<dynamic> FulfillAsync(object text, string to, string from = nu
             // Call to Intento API and get json result
             using (HttpConnector conn = new HttpConnector(Intento))
             {
-                jsonResult = await conn.PostAsync(url, json);
+                jsonResult = await conn.PostAsync(url, json, useSyncwrapper: useSyncwrapper);
             }
 
             if (async && wait_async)
@@ -158,8 +176,18 @@ async public Task<dynamic> FulfillAsync(object text, string to, string from = nu
 
                 jsonResult = await Intento.WaitAsyncJobAsync(id);
             }
+			if (useSyncwrapper)
+			{
+				JObject response = new JObject();
+				response["results"] = jsonResult.results;
+				response["meta"] = jsonResult.meta;
+				response["service"] = jsonResult.service;
+				((JObject)jsonResult)["response"] = new JArray() { response };
+				jsonResult.meta["providers"] = new JArray() { jsonResult.service.provider };
 
-            return jsonResult;
+			}
+
+			return jsonResult;
         }
 
         private dynamic GetJson(object data, string name)
diff --git a/IntentoSDK/IntentoSDK.csproj b/IntentoSDK/IntentoSDK.csproj
index 9e81294..dcade88 100644
--- a/IntentoSDK/IntentoSDK.csproj
+++ b/IntentoSDK/IntentoSDK.csproj
@@ -1,94 +1,99 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.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')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{14D9DA22-F8D4-4F62-975A-7BD821807528}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>IntentoSDK</RootNamespace>
-    <AssemblyName>IntentoSDK</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <DoSign Condition="'$(DoSign)' == ''">0</DoSign>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath Condition="'$(OutputPath)' == ''">bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath Condition="'$(OutputPath)' == ''">bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>intento_sn.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DelaySign>false</DelaySign>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GitHash.cs" />
-    <Compile Include="Helpers.cs" />
-    <Compile Include="HttpConnector.cs" />
-    <Compile Include="IntentoAi.cs" />
-    <Compile Include="IntentoAiText.cs" />
-    <Compile Include="IntentoAiTextTranslate.cs" />
-    <Compile Include="Intento.cs" />
-    <Compile Include="IntentoException.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RevisionHistory.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="IntentoSDK.config" />
-    <None Include="intento_sn.snk" />
-    <None Include="packages.config" />
-    <None Include="Properties\IntentoSDK.nuspec" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent Condition="'$(DoSign)' == '1'">powershell -ExecutionPolicy RemoteSigned $(ProjectDir)postbuild.ps1 '$(TargetDir)$(TargetName).dll'</PostBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PreBuildEvent>$(ProjectDir)githashForm.bat &gt;$(ProjectDir)GitHash.cs</PreBuildEvent>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.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')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{14D9DA22-F8D4-4F62-975A-7BD821807528}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>IntentoSDK</RootNamespace>
+    <AssemblyName>IntentoSDK</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <DoSign Condition="'$(DoSign)' == ''">0</DoSign>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath Condition="'$(OutputPath)' == ''">bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath Condition="'$(OutputPath)' == ''">bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>intento_sn.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <DelaySign>false</DelaySign>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="GitHash.cs" />
+    <Compile Include="Handlers\BaseSymbolHandler.cs" />
+    <Compile Include="Handlers\HtmlSymbolHandler.cs" />
+    <Compile Include="Handlers\SymbolHandlersFactory.cs" />
+    <Compile Include="Helpers.cs" />
+    <Compile Include="HttpConnector.cs" />
+    <Compile Include="IntentoAi.cs" />
+    <Compile Include="IntentoAiText.cs" />
+    <Compile Include="IntentoAiTextTranslate.cs" />
+    <Compile Include="Intento.cs" />
+    <Compile Include="IntentoException.cs" />
+    <Compile Include="Handlers\ISymbolHandler.cs" />
+    <Compile Include="Handlers\XmlSymbolHandler.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RevisionHistory.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="IntentoSDK.config" />
+    <None Include="intento_sn.snk" />
+    <None Include="packages.config" />
+    <None Include="Properties\IntentoSDK.nuspec" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent Condition="'$(DoSign)' == '1'">powershell -ExecutionPolicy RemoteSigned $(ProjectDir)postbuild.ps1 '$(TargetDir)$(TargetName).dll'</PostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>$(ProjectDir)githashForm.bat &gt;$(ProjectDir)GitHash.cs</PreBuildEvent>
+  </PropertyGroup>
   <!-- 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/IntentoSDK/Properties/AssemblyInfo.cs b/IntentoSDK/Properties/AssemblyInfo.cs
index 55cda31..2e7096d 100644
--- a/IntentoSDK/Properties/AssemblyInfo.cs
+++ b/IntentoSDK/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@
 // 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.5.3.0")]
-[assembly: AssemblyFileVersion("1.5.3.0")]
+[assembly: AssemblyVersion("1.5.4.0")]
+[assembly: AssemblyFileVersion("1.5.4.0")]
 [assembly: AssemblyInformationalVersion(GitHash.hash)]
 [assembly: AssemblyGitHash(GitHash.hash)]
diff --git a/IntentoSDK/Properties/IntentoSDK.nuspec b/IntentoSDK/Properties/IntentoSDK.nuspec
index 9e548fe..52b9501 100644
--- a/IntentoSDK/Properties/IntentoSDK.nuspec
+++ b/IntentoSDK/Properties/IntentoSDK.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>IntentoSDK</id>
-    <version>1.5.3.0</version>
+    <version>1.5.4.0</version>
     <authors>Intento</authors>
     <owners>Intento</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>