diff --git a/Fop2ClientLib/Fop2ClientLib.csproj b/Fop2ClientLib/Fop2ClientLib.csproj
index 8a102d4..a74b1cd 100644
--- a/Fop2ClientLib/Fop2ClientLib.csproj
+++ b/Fop2ClientLib/Fop2ClientLib.csproj
@@ -13,8 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
diff --git a/Fop2DD/Core/Common/ShellExecutor.cs b/Fop2DD/Core/Common/ShellExecutor.cs
index 7408d60..3e3bac9 100644
--- a/Fop2DD/Core/Common/ShellExecutor.cs
+++ b/Fop2DD/Core/Common/ShellExecutor.cs
@@ -69,8 +69,7 @@ public static string ReplacePlaceholder(string value, IEnumerable<KeyValuePair<s
         /// <returns>Returns the value with all placeholders (if any) replaced with the replacement.</returns>
         public static string ReplacePlaceholder(string value, string placeholder, string replacement, bool useurlencoding)
         {
-
-            return new Regex(Regex.Escape(placeholder), RegexOptions.CultureInvariant | RegexOptions.IgnoreCase).Replace(value, useurlencoding ? HttpUtility.UrlEncode(replacement) : replacement);
+            return new Regex(Regex.Escape(placeholder), RegexOptions.CultureInvariant | RegexOptions.IgnoreCase).Replace(value, useurlencoding ? Uri.EscapeDataString(replacement) : replacement);
         }
     }
 }
diff --git a/Fop2DD/Fop2DD.csproj b/Fop2DD/Fop2DD.csproj
index faa2749..909d475 100644
--- a/Fop2DD/Fop2DD.csproj
+++ b/Fop2DD/Fop2DD.csproj
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
@@ -49,7 +49,6 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Remoting" />
-    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
diff --git a/Fop2DD/Properties/AssemblyInfo.cs b/Fop2DD/Properties/AssemblyInfo.cs
index 11e7c1b..97fed82 100644
--- a/Fop2DD/Properties/AssemblyInfo.cs
+++ b/Fop2DD/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("0.3.0.0")]
-[assembly: AssemblyFileVersion("0.3.0.0")]
+[assembly: AssemblyVersion("0.3.1.0")]
+[assembly: AssemblyFileVersion("0.3.1.0")]
diff --git a/Fop2DD/app.config b/Fop2DD/app.config
index adb386b..e8773ce 100644
--- a/Fop2DD/app.config
+++ b/Fop2DD/app.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="Fop2DD.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="Fop2DD.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <userSettings>
@@ -41,10 +41,10 @@
                 <value>https://www.google.com/search?q=%PHONENUMBER%</value>
             </setting>
             <setting name="DialCmd_Args" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="DialCmd_WorkDir" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="DialCmd_MinLength" serializeAs="String">
                 <value>6</value>
@@ -54,4 +54,4 @@
             </setting>
         </Fop2DD.Properties.Settings>
     </userSettings>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
diff --git a/Fop2DD/setup.iss b/Fop2DD/setup.iss
index 0da378f..1f74099 100644
--- a/Fop2DD/setup.iss
+++ b/Fop2DD/setup.iss
@@ -3,11 +3,11 @@
 [Setup]
 AppPublisher=KeenSystems
 AppPublisherURL=http://www.keensystems.eu
-AppVersion=0.3.0.0
+AppVersion=0.3.1.0
 AppName=Fop2DD
-AppVerName=Fop2DD 0.3.0
+AppVerName=Fop2DD 0.3.1
 AppCopyright=Copyright (C) 2013 KeenSystems
-VersionInfoVersion=0.3.0.0
+VersionInfoVersion=0.3.1.0
 DefaultDirName={pf}\KeenSystems\Fop2DD
 DefaultGroupName=KeenSystems\Fop2DD
 UninstallDisplayIcon={app}\Fop2DD.exe