diff --git a/README.md b/README.md
index 387a87a3..cee30b14 100644
--- a/README.md
+++ b/README.md
@@ -146,6 +146,16 @@ Depending on the system you don't have to provide a generator to the cmake comma
 
 To select some configuration options you can use ccmake or cmake-gui.
 
+For newer version of Visual Studio you can use one of the following commands (for 64 bit builds):
+
+For Visual Studio 2017:
+
+  cmake -G "Visual Studio 15 2017 Win64" ..
+  
+For Visual Studio 2019 (new way to specify the x64 platform):
+
+  cmake -G "Visual Studio 16 2019" .. -A x64
+
 
 ## Using the log service with sqlite
 
diff --git a/dotnet/IEC61850forCSharp/DataSet.cs b/dotnet/IEC61850forCSharp/DataSet.cs
index 2fcb1040..d7304bc9 100644
--- a/dotnet/IEC61850forCSharp/DataSet.cs
+++ b/dotnet/IEC61850forCSharp/DataSet.cs
@@ -34,6 +34,11 @@ namespace IEC61850
         /// This class is used to represent a data set. It is used to store the values
         /// of a data set.
         /// </summary>
+        /// <remarks>
+        /// This class manages native resource. Take care that the finalizer/Dispose is not
+        /// called while running a method or the object is still in use by another object.
+        /// If in doubt please use the "using" statement.
+        /// </remarks>
         public class DataSet : IDisposable
         {
             [DllImport("iec61850", CallingConvention = CallingConvention.Cdecl)]
@@ -108,21 +113,34 @@ namespace IEC61850
                 return ClientDataSet_getDataSetSize(nativeObject);
             }
 
-            public void Dispose()
+            private bool disposed = false;
+
+            protected virtual void Dispose(bool disposing)
             {
                 lock (this)
                 {
-                    if (nativeObject != IntPtr.Zero)
+                    if (!disposed)
                     {
-                        ClientDataSet_destroy(nativeObject);
-                        nativeObject = IntPtr.Zero;
+                        if (nativeObject != IntPtr.Zero)
+                        {
+                            ClientDataSet_destroy(nativeObject);
+                            nativeObject = IntPtr.Zero;
+                        }
+
+                        disposed = true;
                     }
                 }
             }
 
+            public void Dispose()
+            {
+                Dispose(true);
+                GC.SuppressFinalize(this);
+            }
+
             ~DataSet()
             {
-                Dispose();
+                Dispose(false);
             }
 
             internal IntPtr getNativeInstance()
diff --git a/dotnet/IEC61850forCSharp/IEC61850ClientAPI.cs b/dotnet/IEC61850forCSharp/IEC61850ClientAPI.cs
index aff8fc67..29315143 100644
--- a/dotnet/IEC61850forCSharp/IEC61850ClientAPI.cs
+++ b/dotnet/IEC61850forCSharp/IEC61850ClientAPI.cs
@@ -548,7 +548,7 @@ namespace IEC61850
             /// <summary>
             /// Called when there is a change in the connection state
             /// </summary>
-            public delegate void StateChangedHandler(IedConnection connection,IedConnectionState newState);
+            public delegate void StateChangedHandler(IedConnection connection, IedConnectionState newState);
 
             [DllImport("iec61850", CallingConvention = CallingConvention.Cdecl)]
             static extern void IedConnection_installStateChangedHandler(IntPtr connection, InternalStateChangedHandler handler, IntPtr parameter);
@@ -1788,7 +1788,7 @@ namespace IEC61850
             /// by a prior function call.</description>
             /// <param name="handler">The user provided callback handler</param>
             /// <exception cref="IedConnectionException">This exception is thrown if there is a connection or service error</exception>
-            [Obsolete("ConnectionClosedHandler is deprecated, please use ConnectionEventHandler instead")]
+            [Obsolete("ConnectionClosedHandler is deprecated, please use StateChangedHandler instead")]
             public void InstallConnectionClosedHandler(ConnectionClosedHandler handler)
             {
                 if (connectionClosedHandler == null)