diff --git a/.build/MvvmCross.Plugin.BLE.nuspec b/.build/MvvmCross.Plugin.BLE.nuspec
index bab3aca4..fc7b598a 100644
--- a/.build/MvvmCross.Plugin.BLE.nuspec
+++ b/.build/MvvmCross.Plugin.BLE.nuspec
@@ -1,7 +1,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>MvvmCross.Plugin.BLE</id>
-    <version>0.9.4</version>
+    <version>1.0.0-beta</version>
     <title>MvvmCross - BLE Plugin</title>
     <authors>xabre, smstube</authors>
     <owners>xabre, smstube</owners>
@@ -17,15 +17,15 @@
     <dependencies>
       <group targetFramework="MonoAndroid">
         <dependency id="MvvmCross.Platform" version="4.1.0" />
-        <dependency id="Xam.Plugin.BLE" version="0.9.4" />
+        <dependency id="Plugin.BLE" version="1.0.0-beta" />
       </group>
       <group targetFramework="Xamarin.iOS">
         <dependency id="MvvmCross.Platform" version="4.1.0" />
-        <dependency id="Xam.Plugin.BLE" version="0.9.4" />
+        <dependency id="Plugin.BLE" version="1.0.0-beta" />
       </group>
       <group targetFramework="portable-net45+win8+wpa81+wp8">
         <dependency id="MvvmCross.Platform" version="4.1.0" />
-        <dependency id="Xam.Plugin.BLE" version="0.9.4" />
+        <dependency id="Plugin.BLE" version="1.0.0-beta" />
       </group>
     </dependencies>
   </metadata>
@@ -35,10 +35,8 @@
     <file src="..\Source\MvvmCross.Plugins.BLE\**\*.cs" target="src\MvvmCross.Plugins.BLE" />
     <file src="..\Source\MvvmCross.Plugins.BLE.Droid\**\*.cs" target="src\MvvmCross.Plugins.BLE.Droid" />
     <file src="..\Source\MvvmCross.Plugins.BLE.iOS\**\*.cs" target="src\MvvmCross.Plugins.BLE.iOS" />-->
-   
     <!-- PCL -->
     <file src="mvx\pcl\MvvmCross.Plugins.BLE.*" target="lib\portable-net45+win8+wpa81+wp8" />
-
     <!-- droid -->
     <file src="mvx\android\MvvmCross.Plugins.BLE.*" target="lib\MonoAndroid" />
     <file src="mvx\android\MvvmCross.Plugins.BLE.Droid.*" target="lib\MonoAndroid" />
@@ -48,4 +46,4 @@
     <file src="mvx\ios\MvvmCross.Plugins.BLE.iOS.*" target="lib\Xamarin.iOS10" />
     <file src="mvx\ios\BlePluginBootstrap.cs.pp" target="content\Xamarin.iOS10\Bootstrap\BlePluginBootstrap.cs.pp" />
   </files>
-</package>
+</package>
\ No newline at end of file
diff --git a/.build/Plugin.BLE.nuspec b/.build/Plugin.BLE.nuspec
index 19a376b7..49b9e85f 100644
--- a/.build/Plugin.BLE.nuspec
+++ b/.build/Plugin.BLE.nuspec
@@ -1,7 +1,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Plugin.BLE</id>
-    <version>0.9.4</version>
+    <version>1.0.0-beta</version>
     <title>BLE Plugin for Xamarin</title>
     <authors>xabre, smstube</authors>
     <owners>xabre, smstube</owners>
@@ -23,15 +23,12 @@
       </group>
     </dependencies>
   </metadata>
-  <files>   
-    <!-- PCL -->    
+  <files>
+    <!-- PCL -->
     <file src="pcl\Plugin.BLE.*" target="lib\portable-net45+win8+wpa81+wp8" />
-
     <!-- droid -->
     <file src="android\Plugin.BLE.*" target="lib\MonoAndroid" />
-    
     <!-- iOS -->
     <file src="ios\Plugin.BLE.*" target="lib\Xamarin.iOS10" />
-        
   </files>
 </package>
\ No newline at end of file
diff --git a/.build/build.fsx b/.build/build.fsx
index ad6b8ada..a8512af8 100644
--- a/.build/build.fsx
+++ b/.build/build.fsx
@@ -19,6 +19,7 @@ let BootstrapFile = "BlePluginBootstrap.cs.pp"
 let NugetPath =  Path.Combine("..", "Source", ".nuget", "NuGet.exe");
 let ProjectSources = Path.Combine("..", "Source");
 let NuspecFiles = ["Plugin.BLE.nuspec"; "MvvmCross.Plugin.BLE.nuspec"];
+let VanillaPluginId = "Plugin.BLE";
 
 let Build (projectName:string, targetSubDir:string) =
     [Path.Combine(ProjectSources, projectName, projectName + ".csproj")]
@@ -30,6 +31,21 @@ let NuVersionGet (specFile:string) =
     let versionElements = doc.Descendants(XName.Get("version", doc.Root.Name.NamespaceName))
     (Seq.head versionElements).Value
 
+let NuVersionVanillaDependencySet (specFile:string, version:string) = 
+    let xmlDocument = new XmlDocument()
+    xmlDocument.Load specFile
+    let nsmgr = XmlNamespaceManager(xmlDocument.NameTable)
+    nsmgr.AddNamespace("ns", "http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd")
+    let dependencyNodes = xmlDocument.DocumentElement.SelectNodes("//ns:dependency", nsmgr)
+
+    let setAttributeVersion (node:XmlElement) = 
+        if node.GetAttribute("id").Equals(VanillaPluginId) then
+            node.SetAttribute("version", version)        
+
+    for node in dependencyNodes do
+       node :?> XmlElement |> setAttributeVersion
+    xmlDocument.Save specFile
+
 let NuVersionSet (specFile:string, version:string) = 
     let xmlDocument = new XmlDocument()
     xmlDocument.Load specFile
@@ -39,6 +55,7 @@ let NuVersionSet (specFile:string, version:string) =
     node.InnerText <- version
     xmlDocument.Save specFile
 
+
 let NuPack (specFile:string, publish:bool) = 
     let version = NuVersionGet(specFile)
     let project = Path.GetFileNameWithoutExtension(specFile)
@@ -105,7 +122,14 @@ Target "version" (fun _ ->
         AssemblyInformationalVersion = version
     })
 
-    List.iter (fun f -> NuVersionSet(f, version)) NuspecFiles
+    let updateVersions(file : string, version : string) = 
+        NuVersionSet(file, version)
+        NuVersionVanillaDependencySet(file, version)
+
+    NuspecFiles |> List.iter (fun file ->
+    
+        updateVersions(file, version)
+    )
 )
 
 Target "publish" (fun _ ->    
diff --git a/Source/BLE.Client/BLE.Client.Droid/Properties/AssemblyInfo.cs b/Source/BLE.Client/BLE.Client.Droid/Properties/AssemblyInfo.cs
index 63e023a3..4238f935 100644
--- a/Source/BLE.Client/BLE.Client.Droid/Properties/AssemblyInfo.cs
+++ b/Source/BLE.Client/BLE.Client.Droid/Properties/AssemblyInfo.cs
@@ -1,34 +1,34 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Android.App;
-
-// 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("BLE.Client.Droid")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("BLE.Client.Droid")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-// 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("0.9.4")]
-[assembly: AssemblyVersion("0.9.4")]
-[assembly: AssemblyFileVersion("0.9.4")]
-
-// Add some common permissions, these can be removed if not needed
-[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
-[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Android.App;
+
+// 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("BLE.Client.Droid")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("BLE.Client.Droid")]
+[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
+
+// 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.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
+
+// Add some common permissions, these can be removed if not needed
+[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
+[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
diff --git a/Source/BLE.Client/BLE.Client.iOS/Properties/AssemblyInfo.cs b/Source/BLE.Client/BLE.Client.iOS/Properties/AssemblyInfo.cs
index 9b6fddd7..78f7f9c3 100644
--- a/Source/BLE.Client/BLE.Client.iOS/Properties/AssemblyInfo.cs
+++ b/Source/BLE.Client/BLE.Client.iOS/Properties/AssemblyInfo.cs
@@ -1,36 +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("BLE.Client.iOS")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("BLE.Client.iOS")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[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("72bdc44f-c588-44f3-b6df-9aace7daafdd")]
-
-// 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("0.9.4")]
-[assembly: AssemblyVersion("0.9.4")]
-[assembly: AssemblyFileVersion("0.9.4")]
+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("BLE.Client.iOS")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("BLE.Client.iOS")]
+[assembly: AssemblyCopyright("Copyright ©  2014")]
+[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("72bdc44f-c588-44f3-b6df-9aace7daafdd")]
+
+// 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.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
diff --git a/Source/BLE.Client/BLE.Client/Properties/AssemblyInfo.cs b/Source/BLE.Client/BLE.Client/Properties/AssemblyInfo.cs
index 46cec48c..fa9c9c11 100644
--- a/Source/BLE.Client/BLE.Client/Properties/AssemblyInfo.cs
+++ b/Source/BLE.Client/BLE.Client/Properties/AssemblyInfo.cs
@@ -26,7 +26,7 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("0.9.4")]
-[assembly: AssemblyVersion("0.9.4")]
-[assembly: AssemblyFileVersion("0.9.4")]
-[assembly: XamlCompilation(XamlCompilationOptions.Compile)]
\ No newline at end of file
+// [assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: XamlCompilation(XamlCompilationOptions.Compile)]
diff --git a/Source/BLE.Server.Droid/Properties/AssemblyInfo.cs b/Source/BLE.Server.Droid/Properties/AssemblyInfo.cs
index cb670c41..5986d8f9 100644
--- a/Source/BLE.Server.Droid/Properties/AssemblyInfo.cs
+++ b/Source/BLE.Server.Droid/Properties/AssemblyInfo.cs
@@ -1,30 +1,30 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Android.App;
-
-// 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("BLE.Server.Droid")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Zuehlke Technology Group")]
-[assembly: AssemblyProduct("BLE.Server.Droid")]
-[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-// 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("0.9.4")]
-[assembly: AssemblyVersion("0.9.4")]
-[assembly: AssemblyFileVersion("0.9.4")]
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Android.App;
+
+// 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("BLE.Server.Droid")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Zuehlke Technology Group")]
+[assembly: AssemblyProduct("BLE.Server.Droid")]
+[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
+
+// 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.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
diff --git a/Source/MvvmCross.Plugins.BLE.Droid/Properties/AssemblyInfo.cs b/Source/MvvmCross.Plugins.BLE.Droid/Properties/AssemblyInfo.cs
index 7573dcd5..40e75988 100644
--- a/Source/MvvmCross.Plugins.BLE.Droid/Properties/AssemblyInfo.cs
+++ b/Source/MvvmCross.Plugins.BLE.Droid/Properties/AssemblyInfo.cs
@@ -1,30 +1,30 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Android.App;
-
-// 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("MvvmCross.Plugins.BLE.Droid")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Zuehlke Technology Group")]
-[assembly: AssemblyProduct("MvvmCross.Plugins.BLE.Droid")]
-[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-// 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("0.9.4")]
-[assembly: AssemblyVersion("0.9.4")]
-[assembly: AssemblyFileVersion("0.9.4")]
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Android.App;
+
+// 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("MvvmCross.Plugins.BLE.Droid")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Zuehlke Technology Group")]
+[assembly: AssemblyProduct("MvvmCross.Plugins.BLE.Droid")]
+[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
+
+// 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.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
diff --git a/Source/MvvmCross.Plugins.BLE.iOS/Properties/AssemblyInfo.cs b/Source/MvvmCross.Plugins.BLE.iOS/Properties/AssemblyInfo.cs
index d7cf5c92..709071f1 100644
--- a/Source/MvvmCross.Plugins.BLE.iOS/Properties/AssemblyInfo.cs
+++ b/Source/MvvmCross.Plugins.BLE.iOS/Properties/AssemblyInfo.cs
@@ -1,36 +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("MvvmCross.Plugins.BLE.iOS")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Zuehlke Technology Group")]
-[assembly: AssemblyProduct("MvvmCross.Plugins.BLE.iOS")]
-[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2015")]
-[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("7ba2a80e-62f9-44f8-bb2d-2a9fafe38d3d")]
-
-// 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("0.9.4")]
-[assembly: AssemblyVersion("0.9.4")]
-[assembly: AssemblyFileVersion("0.9.4")]
+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("MvvmCross.Plugins.BLE.iOS")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Zuehlke Technology Group")]
+[assembly: AssemblyProduct("MvvmCross.Plugins.BLE.iOS")]
+[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2015")]
+[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("7ba2a80e-62f9-44f8-bb2d-2a9fafe38d3d")]
+
+// 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.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
diff --git a/Source/MvvmCross.Plugins.BLE/Properties/AssemblyInfo.cs b/Source/MvvmCross.Plugins.BLE/Properties/AssemblyInfo.cs
index c7302727..3ba108b4 100644
--- a/Source/MvvmCross.Plugins.BLE/Properties/AssemblyInfo.cs
+++ b/Source/MvvmCross.Plugins.BLE/Properties/AssemblyInfo.cs
@@ -1,30 +1,30 @@
-using System.Resources;
-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("MvvmCross.Plugins.BLE")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Zuehlke Technology Group")]
-[assembly: AssemblyProduct("MvvmCross.Plugins.BLE")]
-[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// 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("0.9.4")]
-[assembly: AssemblyVersion("0.9.4")]
-[assembly: AssemblyFileVersion("0.9.4")]
+using System.Resources;
+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("MvvmCross.Plugins.BLE")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Zuehlke Technology Group")]
+[assembly: AssemblyProduct("MvvmCross.Plugins.BLE")]
+[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en")]
+
+// 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.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
diff --git a/Source/Plugin.BLE.Abstractions/Properties/AssemblyInfo.cs b/Source/Plugin.BLE.Abstractions/Properties/AssemblyInfo.cs
index 11be661c..137e68b8 100644
--- a/Source/Plugin.BLE.Abstractions/Properties/AssemblyInfo.cs
+++ b/Source/Plugin.BLE.Abstractions/Properties/AssemblyInfo.cs
@@ -1,30 +1,30 @@
-using System.Resources;
-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("Plugin.BLE.Abstractions")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Plugin.BLE.Abstractions")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// 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("0.9.4")]
-[assembly: AssemblyVersion("0.9.4")]
-[assembly: AssemblyFileVersion("0.9.4")]
+using System.Resources;
+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("Plugin.BLE.Abstractions")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Plugin.BLE.Abstractions")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en")]
+
+// 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.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
diff --git a/Source/Plugin.BLE.Android/Adapter.cs b/Source/Plugin.BLE.Android/Adapter.cs
index 8bacff69..1e40ffac 100644
--- a/Source/Plugin.BLE.Android/Adapter.cs
+++ b/Source/Plugin.BLE.Android/Adapter.cs
@@ -162,7 +162,7 @@ protected override Task ConnectToDeviceNativeAync(IDevice device, bool autoconne
         {
             AddToDeviceOperationRegistry(device);
             ((BluetoothDevice) device.NativeDevice).ConnectGatt(Application.Context, autoconnect, _gattCallback);
-            return Task.CompletedTask;
+            return Task.FromResult(true);
         }
 
         protected override void DisconnectDeviceNative(IDevice device)
diff --git a/Source/Plugin.BLE.Android/Properties/AssemblyInfo.cs b/Source/Plugin.BLE.Android/Properties/AssemblyInfo.cs
index 2491e2aa..424cd66f 100644
--- a/Source/Plugin.BLE.Android/Properties/AssemblyInfo.cs
+++ b/Source/Plugin.BLE.Android/Properties/AssemblyInfo.cs
@@ -1,30 +1,30 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Android.App;
-
-// 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("Plugin.BLE.Android")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Plugin.BLE.Android")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-// 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("0.9.4")]
-[assembly: AssemblyVersion("0.9.4")]
-[assembly: AssemblyFileVersion("0.9.4")]
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Android.App;
+
+// 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("Plugin.BLE.Android")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Plugin.BLE.Android")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
+
+// 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.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
diff --git a/Source/Plugin.BLE.iOS/Adapter.cs b/Source/Plugin.BLE.iOS/Adapter.cs
index ac1e525a..dd27cd05 100644
--- a/Source/Plugin.BLE.iOS/Adapter.cs
+++ b/Source/Plugin.BLE.iOS/Adapter.cs
@@ -165,7 +165,7 @@ protected override Task ConnectToDeviceNativeAync(IDevice device, bool autoconne
             _centralManager.ConnectPeripheral(device.NativeDevice as CBPeripheral,
                 new PeripheralConnectionOptions());
 
-            return Task.CompletedTask;
+            return Task.FromResult(true);
         }
 
         private static Guid ParseDeviceGuid(CBPeripheral peripherial)
diff --git a/Source/Plugin.BLE.iOS/Properties/AssemblyInfo.cs b/Source/Plugin.BLE.iOS/Properties/AssemblyInfo.cs
index dccb6c94..4bd90702 100644
--- a/Source/Plugin.BLE.iOS/Properties/AssemblyInfo.cs
+++ b/Source/Plugin.BLE.iOS/Properties/AssemblyInfo.cs
@@ -1,36 +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("Plugin.BLE.iOS")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Plugin.BLE.iOS")]
-[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("00f27efe-b8a3-4fd3-bc1f-1179fa7d91b9")]
-
-// 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("0.9.4")]
-[assembly: AssemblyVersion("0.9.4")]
-[assembly: AssemblyFileVersion("0.9.4")]
+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("Plugin.BLE.iOS")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Plugin.BLE.iOS")]
+[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("00f27efe-b8a3-4fd3-bc1f-1179fa7d91b9")]
+
+// 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.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
diff --git a/Source/Plugin.BLE/Properties/AssemblyInfo.cs b/Source/Plugin.BLE/Properties/AssemblyInfo.cs
index 48aee831..12078b60 100644
--- a/Source/Plugin.BLE/Properties/AssemblyInfo.cs
+++ b/Source/Plugin.BLE/Properties/AssemblyInfo.cs
@@ -1,30 +1,30 @@
-using System.Resources;
-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("Plugin.BLE")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Plugin.BLE")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// 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("0.9.4")]
-[assembly: AssemblyVersion("0.9.4")]
-[assembly: AssemblyFileVersion("0.9.4")]
+using System.Resources;
+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("Plugin.BLE")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Plugin.BLE")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en")]
+
+// 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.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]