diff --git a/.gitignore b/.gitignore
index 5f93d9cd9..5332a1e57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,10 +13,11 @@ ChangeLog
 AcceptanceTest/AcceptanceTests*.html
 AcceptanceTest/AcceptanceTests*.xml
 AcceptanceTest/TestResult.xml
-AcceptanceTest/bin/Debug/*
-AcceptanceTest/bin/Release/*
+AcceptanceTest/bin/
+AcceptanceTest/obj/
 AcceptanceTest/log/
 AcceptanceTest/store/
+AcceptanceTest/cfg/at.cfg
 Examples/Executor/bin/*
 Examples/Executor/obj/*
 Examples/Executor/log/
diff --git a/AcceptanceTest/cfg/.gitignore b/AcceptanceTest/cfg/.gitignore
deleted file mode 100644
index 7103328ab..000000000
--- a/AcceptanceTest/cfg/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.cfg
diff --git a/AcceptanceTest/cfg/at_44.cfg b/AcceptanceTest/cfg/at_44.cfg
index 66e5671e3..0a689389d 100644
--- a/AcceptanceTest/cfg/at_44.cfg
+++ b/AcceptanceTest/cfg/at_44.cfg
@@ -11,17 +11,5 @@ TargetCompID=TW
 ResetOnLogon=Y 
 FileStorePath=store 
 [SESSION] 
-BeginString=FIX.4.0 
-DataDictionary=..\spec\fix\FIX40.xml 
-[SESSION] 
-BeginString=FIX.4.1 
-DataDictionary=..\spec\fix\FIX41.xml 
-[SESSION] 
-BeginString=FIX.4.2 
-DataDictionary=..\spec\fix\FIX42.xml 
-[SESSION] 
-BeginString=FIX.4.3 
-DataDictionary=..\spec\fix\FIX43.xml 
-[SESSION] 
 BeginString=FIX.4.4 
-DataDictionary=..\spec\fix\FIX44.xml 
\ No newline at end of file
+DataDictionary=..\spec\fix\FIX44.xml 
diff --git a/AcceptanceTest/cfg/at_44_noreset.cfg b/AcceptanceTest/cfg/at_44_noreset.cfg
new file mode 100644
index 000000000..ca2bab43f
--- /dev/null
+++ b/AcceptanceTest/cfg/at_44_noreset.cfg
@@ -0,0 +1,15 @@
+[DEFAULT] 
+Verbose=Y 
+FileLogPath=log 
+ConnectionType=acceptor 
+SocketAcceptPort=5005 
+SocketReuseAddress=Y 
+StartTime=00:00:00 
+EndTime=00:00:00 
+SenderCompID=ISLD 
+TargetCompID=TW 
+ResetOnLogon=N
+FileStorePath=store 
+[SESSION] 
+BeginString=FIX.4.4 
+DataDictionary=..\spec\fix\FIX44.xml 
diff --git a/AcceptanceTest/cfg/at_50.cfg b/AcceptanceTest/cfg/at_50.cfg
index 85074b290..efa960068 100644
--- a/AcceptanceTest/cfg/at_50.cfg
+++ b/AcceptanceTest/cfg/at_50.cfg
@@ -10,23 +10,8 @@ SenderCompID=ISLD
 TargetCompID=TW 
 ResetOnLogon=Y 
 FileStorePath=store 
-[SESSION] 
-BeginString=FIX.4.0 
-DataDictionary=..\spec\fix\FIX40.xml 
-[SESSION] 
-BeginString=FIX.4.1 
-DataDictionary=..\spec\fix\FIX41.xml 
-[SESSION] 
-BeginString=FIX.4.2 
-DataDictionary=..\spec\fix\FIX42.xml 
-[SESSION] 
-BeginString=FIX.4.3 
-DataDictionary=..\spec\fix\FIX43.xml 
-[SESSION] 
-BeginString=FIX.4.4 
-DataDictionary=..\spec\fix\FIX44.xml
 [SESSION]
 BeginString=FIXT.1.1
 DefaultApplVerID=FIX.5.0
 AppDataDictionary=..\spec\fix\FIX50.xml
-TransportDataDictionary=..\spec\fix\FIXT11.xml
\ No newline at end of file
+TransportDataDictionary=..\spec\fix\FIXT11.xml
diff --git a/AcceptanceTest/cfg/at_50_sp1.cfg b/AcceptanceTest/cfg/at_50_sp1.cfg
index d4994246e..3dbefdb32 100644
--- a/AcceptanceTest/cfg/at_50_sp1.cfg
+++ b/AcceptanceTest/cfg/at_50_sp1.cfg
@@ -10,21 +10,6 @@ SenderCompID=ISLD
 TargetCompID=TW 
 ResetOnLogon=Y 
 FileStorePath=store 
-[SESSION] 
-BeginString=FIX.4.0 
-DataDictionary=..\spec\fix\FIX40.xml 
-[SESSION] 
-BeginString=FIX.4.1 
-DataDictionary=..\spec\fix\FIX41.xml 
-[SESSION] 
-BeginString=FIX.4.2 
-DataDictionary=..\spec\fix\FIX42.xml 
-[SESSION] 
-BeginString=FIX.4.3 
-DataDictionary=..\spec\fix\FIX43.xml 
-[SESSION] 
-BeginString=FIX.4.4 
-DataDictionary=..\spec\fix\FIX44.xml
 [SESSION]
 BeginString=FIXT.1.1
 DefaultApplVerID=FIX.5.0SP1
diff --git a/AcceptanceTest/cfg/at_50_sp2.cfg b/AcceptanceTest/cfg/at_50_sp2.cfg
index 6673a71e2..bfb589be1 100644
--- a/AcceptanceTest/cfg/at_50_sp2.cfg
+++ b/AcceptanceTest/cfg/at_50_sp2.cfg
@@ -10,21 +10,6 @@ SenderCompID=ISLD
 TargetCompID=TW 
 ResetOnLogon=Y 
 FileStorePath=store 
-[SESSION] 
-BeginString=FIX.4.0 
-DataDictionary=..\spec\fix\FIX40.xml 
-[SESSION] 
-BeginString=FIX.4.1 
-DataDictionary=..\spec\fix\FIX41.xml 
-[SESSION] 
-BeginString=FIX.4.2 
-DataDictionary=..\spec\fix\FIX42.xml 
-[SESSION] 
-BeginString=FIX.4.3 
-DataDictionary=..\spec\fix\FIX43.xml 
-[SESSION] 
-BeginString=FIX.4.4 
-DataDictionary=..\spec\fix\FIX44.xml
 [SESSION]
 BeginString=FIXT.1.1
 DefaultApplVerID=FIX.5.0SP2
diff --git a/AcceptanceTest/definitions/server/fix44/SessionReset.def b/AcceptanceTest/definitions/server/fix44/SessionReset.def
index f6ddf7831..18237f473 100644
--- a/AcceptanceTest/definitions/server/fix44/SessionReset.def
+++ b/AcceptanceTest/definitions/server/fix44/SessionReset.def
@@ -20,7 +20,7 @@ E8=FIX.4.4
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y

 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

+E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIX.4.4
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

@@ -31,4 +31,4 @@ E8=FIX.4.4
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 I8=FIX.4.4
35=5
34=3
49=TW
52=<TIME>
56=ISLD

 E8=FIX.4.4
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 
-eDISCONNECT
\ No newline at end of file
+eDISCONNECT
diff --git a/AcceptanceTest/definitions/server/fix44noreset/SessionResetAfterDisconnect.def b/AcceptanceTest/definitions/server/fix44noreset/SessionResetAfterDisconnect.def
new file mode 100644
index 000000000..62f536817
--- /dev/null
+++ b/AcceptanceTest/definitions/server/fix44noreset/SessionResetAfterDisconnect.def
@@ -0,0 +1,40 @@
+# Issue #80: logon with reset _after_disconnect_
+
+iCONNECT
+# logon with reset, because this config has ResetOnLogon=N
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y

+E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=3
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=4
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=5
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=6
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=7
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=8
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=9
49=TW
52=<TIME>
56=ISLD

+
+#Send TestRequest, expect HeartBeat response
+I8=FIX.4.4
35=1
34=10
49=TW
52=<TIME>
56=ISLD
112=1

+E8=FIX.4.4
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

+
+#Logout and response
+I8=FIX.4.4
35=5
34=11
49=TW
52=<TIME>
56=ISLD

+E8=FIX.4.4
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

+
+eDISCONNECT
+iCONNECT
+
+#send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y

+#Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
+E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+
+#Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
+I8=FIX.4.4
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

+E8=FIX.4.4
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

+
+# logout message and response
+I8=FIX.4.4
35=5
34=3
49=TW
52=<TIME>
56=ISLD

+E8=FIX.4.4
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

+
+eDISCONNECT
diff --git a/AcceptanceTest/definitions/server/fix50/SessionReset.def b/AcceptanceTest/definitions/server/fix50/SessionReset.def
index 383ee0e2b..41827d021 100644
--- a/AcceptanceTest/definitions/server/fix50/SessionReset.def
+++ b/AcceptanceTest/definitions/server/fix50/SessionReset.def
@@ -21,7 +21,7 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y
1137=7

 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

+E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

@@ -31,4 +31,4 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 
-eDISCONNECT
\ No newline at end of file
+eDISCONNECT
diff --git a/AcceptanceTest/definitions/server/fix50sp1/SessionReset.def b/AcceptanceTest/definitions/server/fix50sp1/SessionReset.def
index bc14acc50..520c31fd8 100644
--- a/AcceptanceTest/definitions/server/fix50sp1/SessionReset.def
+++ b/AcceptanceTest/definitions/server/fix50sp1/SessionReset.def
@@ -21,7 +21,7 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y
1137=8

 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

+E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

@@ -31,4 +31,4 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 
-eDISCONNECT
\ No newline at end of file
+eDISCONNECT
diff --git a/AcceptanceTest/definitions/server/fix50sp2/SessionReset.def b/AcceptanceTest/definitions/server/fix50sp2/SessionReset.def
index 066ea59f1..9564c629f 100644
--- a/AcceptanceTest/definitions/server/fix50sp2/SessionReset.def
+++ b/AcceptanceTest/definitions/server/fix50sp2/SessionReset.def
@@ -21,7 +21,7 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y
1137=9

 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

+E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

@@ -31,4 +31,4 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 
-eDISCONNECT
\ No newline at end of file
+eDISCONNECT
diff --git a/AcceptanceTest/obj/Debug/.gitignore b/AcceptanceTest/obj/Debug/.gitignore
deleted file mode 100644
index 72e8ffc0d..000000000
--- a/AcceptanceTest/obj/Debug/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/AcceptanceTest/obj/Release/.gitignore b/AcceptanceTest/obj/Release/.gitignore
deleted file mode 100644
index 72e8ffc0d..000000000
--- a/AcceptanceTest/obj/Release/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/NEXT_VERSION.md b/NEXT_VERSION.md
index f05ba3fc2..919f7471d 100644
--- a/NEXT_VERSION.md
+++ b/NEXT_VERSION.md
@@ -27,5 +27,8 @@ Changes since the last version (oldest first):
 * (minor) #286 - FieldBase.Equals() and .GetHashcode() (steffanu)
 * (patch) #287 - sync fix in Session class (steffanu)
 * (patch) #275 - SessionID.IsSet() should be used instead of !=SessionID.NOT_SET (akamyshanov)
-
+* (patch) #297 - revert #287
+* (patch) #290 - support for RefreshOnLogon (martinadams)
+* (patch)  #80 - fixes to tag-141-related sequence resets (TomasVetrovsky,akamyshanov,gbirchmeier)
+* (minor) #314 - New feature: add/remove sessions dynamically (martinadams)
 
diff --git a/QuickFIXn/AbstractInitiator.cs b/QuickFIXn/AbstractInitiator.cs
index d4fcf1b72..7abffd562 100644
--- a/QuickFIXn/AbstractInitiator.cs
+++ b/QuickFIXn/AbstractInitiator.cs
@@ -21,6 +21,7 @@ public abstract class AbstractInitiator : IInitiator
         private HashSet<SessionID> disconnected_ = new HashSet<SessionID>();
         private bool isStopped_ = true;
         private Thread thread_;
+        private SessionFactory sessionFactory_ = null;
 
         #region Properties
 
@@ -59,18 +60,11 @@ public void Start()
                 throw new System.ObjectDisposedException(this.GetType().Name);
 
             // create all sessions
-            SessionFactory factory = new SessionFactory(_app, _storeFactory, _logFactory, _msgFactory);
+            sessionFactory_ = new SessionFactory(_app, _storeFactory, _logFactory, _msgFactory);
             foreach (SessionID sessionID in _settings.GetSessions())
             {
                 Dictionary dict = _settings.Get(sessionID);
-                string connectionType = dict.GetString(SessionSettings.CONNECTION_TYPE);
-
-                if ("initiator".Equals(connectionType))
-                {
-                    sessionIDs_.Add(sessionID);
-                    sessions_[sessionID] = factory.Create(sessionID, dict);
-                    SetDisconnected(sessionID);
-                }
+                AddSession(sessionID, dict);
             }
 
             if (0 == sessions_.Count)
@@ -83,6 +77,65 @@ public void Start()
             thread_.Start();
         }
 
+        /// <summary>
+        /// Add new session, either at start-up or as an ad-hoc operation
+        /// </summary>
+        /// <param name="sessionID">ID of new session<param>
+        /// <param name="dict">config settings for new session</param></param>
+        /// <returns>true if session added successfully, false if session already exists or is not an initiator</returns>
+        public bool AddSession(SessionID sessionID, Dictionary dict)
+        {
+            if (dict.GetString(SessionSettings.CONNECTION_TYPE) == "initiator" && !sessionIDs_.Contains(sessionID))
+            {
+                Session session = sessionFactory_.Create(sessionID, dict);
+                lock (sync_)
+                {
+                    if (!_settings.Has(sessionID))  // session won't be in settings if ad-hoc creation after startup
+                        _settings.Set(sessionID, dict);
+                    sessionIDs_.Add(sessionID);
+                    sessions_[sessionID] = session;
+                    SetDisconnected(sessionID);
+                }
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Ad-hoc removal of an existing session
+        /// </summary>
+        /// <param name="sessionID">ID of session to be removed</param>
+        /// <param name="terminateActiveSession">if true, force disconnection and removal of session even if it has an active connection</param>
+        /// <returns>true if session removed or not already present; false if could not be removed due to an active connection</returns>
+        public bool RemoveSession(SessionID sessionID, bool terminateActiveSession)
+        {
+            Session session = null;
+            bool disconnectRequired = false;
+            lock (sync_)
+            {
+                if (sessionIDs_.Contains(sessionID))
+                {
+                    session = sessions_[sessionID];
+                    if (session.IsLoggedOn && !terminateActiveSession)
+                        return false;
+
+                    sessions_.Remove(sessionID);
+                    _settings.Remove(sessionID);
+                    disconnectRequired = IsConnected(sessionID) || IsPending(sessionID);
+                    if (disconnectRequired)
+                        SetDisconnected(sessionID);
+                    disconnected_.Remove(sessionID);
+                    sessionIDs_.Remove(sessionID);
+                    OnRemove(sessionID);
+                }
+            }
+            if (disconnectRequired)
+                session.Disconnect("Dynamic session removal");
+            if (session != null)
+                session.Dispose();
+            return true;
+        }
+
         /// <summary>
         /// Logout existing session and close connection.  Attempt graceful disconnect first.
         /// </summary>
@@ -144,12 +197,13 @@ public void Stop(bool force)
             {
                 foreach (Session s in sessions_.Values)
                     s.Dispose();
+
+                sessions_.Clear();
+                sessionIDs_.Clear();
+                pending_.Clear();
+                connected_.Clear();
+                disconnected_.Clear();
             }
-            sessions_.Clear();
-            sessionIDs_.Clear();
-            pending_.Clear();
-            connected_.Clear();
-            disconnected_.Clear();
         }
 
         public bool IsLoggedOn
@@ -178,6 +232,14 @@ public bool IsLoggedOn
         protected virtual void OnConfigure(SessionSettings settings)
         { }
 
+        /// <summary>
+        /// Implement this to provide custom reaction behavior to an ad-hoc session removal.
+        /// (This is called after the session is removed.)
+        /// </summary>
+        /// <param name="sessionID">ID of session that was removed</param>
+        protected virtual void OnRemove(SessionID sessionID)
+        { }
+
         [System.Obsolete("This method's intended purpose is unclear.  Don't use it.")]
         protected virtual void OnInitialize(SessionSettings settings)
         { }
@@ -254,9 +316,12 @@ protected void SetDisconnected(SessionID sessionID)
         {
             lock (sync_)
             {
-                pending_.Remove(sessionID);
-                connected_.Remove(sessionID);
-                disconnected_.Add(sessionID);
+                if (sessionIDs_.Contains(sessionID))
+                {
+                    pending_.Remove(sessionID);
+                    connected_.Remove(sessionID);
+                    disconnected_.Add(sessionID);
+                }
             }
         }
 
diff --git a/QuickFIXn/Dictionary.cs b/QuickFIXn/Dictionary.cs
index a7026c16b..9f19a3d04 100755
--- a/QuickFIXn/Dictionary.cs
+++ b/QuickFIXn/Dictionary.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Linq;
+using System.Collections.Generic;
 using System.Globalization;
 
 namespace QuickFix
@@ -37,7 +39,8 @@ public int Size
         }
         
         #endregion
-        
+
+        #region Public Methods
         public Dictionary()
         { }
 
@@ -195,6 +198,50 @@ public void Merge(Dictionary toMerge)
                 if(!data_.ContainsKey(entry.Key))
                     data_[entry.Key] = entry.Value;
         }
+        #endregion
+
+        #region Public Overrides
+        /// <summary>
+        /// Test Dictionary objects for equality.
+        /// Dictionaries are deemed to be equal if their names and dictionary contents are the same
+        /// </summary>
+        /// <param name="other">Dictionary to compare against</param>
+        /// <returns>true if the two Dictionary objects are the same in terms of contents, else false</returns>
+        public override bool Equals(object other)
+        {
+            //Check whether the compared objects reference the same data.
+            if (Object.ReferenceEquals(this, other))
+                return true;
+
+            //Check whether the compared object is null.
+            if (Object.ReferenceEquals(other, null))
+                return false;
+
+            //Check whether the names and dictionary contents are the same
+            var otherDict = (Dictionary)other;
+            if (Name != otherDict.Name || Count != otherDict.Count)
+                return false;
+
+            // Could use LINQ query here, but this is probably faster!
+            string otherDictValue = null;
+            foreach (var kvp in data_)
+                if (!otherDict.data_.TryGetValue(kvp.Key, out otherDictValue) || otherDictValue != kvp.Value)
+                    return false;
+            return true;
+        }
+
+        /// <summary>
+        /// Generate hash code for the Dictionary.
+        /// If Equals() returns true for a compared object,
+        /// then GetHashCode() must return the same value for this object and the compared object.
+        /// </summary>
+        /// <returns>hash code</returns>
+        public override int GetHashCode()
+        {
+            int nameHash = Object.ReferenceEquals(Name, null) ? 1 : Name.GetHashCode();
+            return nameHash + 100 * Count;
+        }
+        #endregion
 
         #region IEnumerable Members
 
diff --git a/QuickFIXn/IAcceptor.cs b/QuickFIXn/IAcceptor.cs
index 76fdab26b..ac06236a0 100644
--- a/QuickFIXn/IAcceptor.cs
+++ b/QuickFIXn/IAcceptor.cs
@@ -41,6 +41,22 @@ public interface IAcceptor
         /// </summary>
         /// <returns>a map of SessionIDs to EndPoints</returns>
         Dictionary<SessionID,IPEndPoint> GetAcceptorAddresses();
+
+        /// <summary>
+        /// Add a new session after acceptor has been started
+        /// </summary>
+        /// <param name="sessionID">ID of session to be added</param>
+        /// <param name="dict">session settings</param>
+        /// <returns>>true if session added successfully, false if session already exists or is not an acceptor</returns>
+        bool AddSession(SessionID sessionID, QuickFix.Dictionary dict);
+
+        /// <summary>
+        /// Remove an existing session after acceptor has been started
+        /// </summary>
+        /// <param name="sessionID">ID of session to be removed</param>
+        /// <param name="terminateActiveSession">if true, force disconnection and removal of session even if it has an active connection</param>
+        /// <returns>true if session removed or not already present; false if could not be removed due to an active connection</returns>
+        bool RemoveSession(SessionID sessionID, bool terminateActiveSession);
     }
 
     /// <summary>
diff --git a/QuickFIXn/IApplicationExt.cs b/QuickFIXn/IApplicationExt.cs
new file mode 100644
index 000000000..2555472cc
--- /dev/null
+++ b/QuickFIXn/IApplicationExt.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace QuickFix
+{
+    /// <summary>
+    /// This is the optional extension interface for processing inbound messages,
+    /// and facilitates early interception of such messages. 'Early', in this context,
+    /// means after structure, length and checksum have been validated, but before any
+    /// further validation has been performed.
+    /// This interface will not normally be required, and it should be used only with caution:
+    /// it allows modfications to be made to irregular inbound messages that would otherwise
+    /// fail validation against the Fix dictionary, an provides an alternative to dictionary
+    /// customisation as a means of dealing with such messages.
+    /// </summary>
+    public interface IApplicationExt : IApplication
+    {
+        /// <summary>
+        /// This callback provides early notification of when an administrative or application  message is sent from a counterparty to your FIX engine.
+        /// This can be useful for doing pre-processing of an inbound message after its structure, checksum and length have been validated, but before
+        /// any further validation has been performed on it.
+        /// </summary>
+        /// <param name="message">received message</param>
+        /// <param name="sessionID">session on which message received</param>
+        void FromEarlyIntercept(Message message, SessionID sessionID);
+    }
+}
diff --git a/QuickFIXn/IInitiator.cs b/QuickFIXn/IInitiator.cs
index eb25a3b25..6747b1569 100644
--- a/QuickFIXn/IInitiator.cs
+++ b/QuickFIXn/IInitiator.cs
@@ -41,6 +41,22 @@ public interface IInitiator : IDisposable
         /// </summary>
         /// <returns>the SessionIDs for the sessions managed by this initiator</returns>
         HashSet<SessionID> GetSessionIDs();
+
+        /// <summary>
+        /// Add a new session after initiator has been started
+        /// </summary>
+        /// <param name="sessionID">ID of session to be added</param>
+        /// <param name="dict">session settings</param>
+        /// <returns>true if session added successfully, false if session already exists or is not an initiator</returns>
+        bool AddSession(SessionID sessionID, QuickFix.Dictionary dict);
+
+        /// <summary>
+        /// Remove an existing session after initiator has been started
+        /// </summary>
+        /// <param name="sessionID">ID of session to be removed</param>
+        /// <param name="terminateActiveSession">if true, force disconnection and removal of session even if it has an active connection</param>
+        /// <returns>true if session removed or not already present; false if could not be removed due to an active connection</returns>
+        bool RemoveSession(SessionID sessionID, bool terminateActiveSession);
     }
 
     /// <summary>
diff --git a/QuickFIXn/Message/.gitignore b/QuickFIXn/Message/.gitignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/QuickFIXn/QuickFix.csproj b/QuickFIXn/QuickFix.csproj
index c0ef8831b..9f9cca29d 100644
--- a/QuickFIXn/QuickFix.csproj
+++ b/QuickFIXn/QuickFix.csproj
@@ -67,6 +67,7 @@
     <Compile Include="FileStoreFactory.cs" />
     <Compile Include="FixValues.cs" />
     <Compile Include="IApplication.cs" />
+    <Compile Include="IApplicationExt.cs" />
     <Compile Include="IInitiator.cs" />
     <Compile Include="ILog.cs" />
     <Compile Include="ILogFactory.cs" />
diff --git a/QuickFIXn/Session.cs b/QuickFIXn/Session.cs
index 470be3acd..cb5262f1e 100755
--- a/QuickFIXn/Session.cs
+++ b/QuickFIXn/Session.cs
@@ -22,6 +22,7 @@ public class Session : IDisposable
         private SessionSchedule schedule_;
         private SessionState state_;
         private IMessageFactory msgFactory_;
+        private bool appDoesEarlyIntercept_;
         private static readonly HashSet<string> AdminMsgTypes = new HashSet<string>() { "0", "A", "1", "2", "3", "4", "5" };
 
         #endregion
@@ -211,6 +212,7 @@ public Session(
             this.DataDictionaryProvider = new DataDictionaryProvider(dataDictProvider);
             this.schedule_ = sessionSchedule;
             this.msgFactory_ = msgFactory;
+            this.appDoesEarlyIntercept_ = app is IApplicationExt;
 
             this.SenderDefaultApplVerID = senderDefaultApplVerID;
 
@@ -336,20 +338,18 @@ public virtual bool Send(Message message)
         /// <returns></returns>
         public bool Send(string message)
         {
-            IResponder responder;
             lock (sync_)
             {
                 if (null == responder_)
                     return false;
-                responder = responder_;
+                this.Log.OnOutgoing(message);
+                return responder_.Send(message);
             }
-            this.Log.OnOutgoing(message);
-            return responder.Send(message);
         }
 
         // TODO for v2 - rename, make internal
         /// <summary>
-        /// Sets some internal state variables.  Despite the name, it does do anything to make a logon occur.
+        /// Sets some internal state variables.  Despite the name, it does not do anything to make a logon occur.
         /// </summary>
         public void Logon()
         {
@@ -547,6 +547,9 @@ public void Next(Message message)
                 return;
             }
 
+            if (appDoesEarlyIntercept_)
+                ((IApplicationExt)Application).FromEarlyIntercept(message, this.SessionID);
+
             if (IsNewSession)
                 state_.Reset("New session (detected in Next(Message))");
 
@@ -664,22 +667,24 @@ protected void NextLogon(Message logon)
 
             if (state_.ReceivedReset)
             {
-                this.Log.OnEvent("Logon contains ResetSeqNumFlag=Y, reseting sequence numbers to 1");
+                this.Log.OnEvent("Sequence numbers reset due to ResetSeqNumFlag=Y");
                 if (!state_.SentReset)
                 {
-                    state_.Reset("Reseting because reset was requested by counterparty.");
+                    state_.Reset("Reset requested by counterparty");
                 }
             }
 
             if (!state_.IsInitiator && this.ResetOnLogon)
                 state_.Reset("ResetOnLogon");
+            if (this.RefreshOnLogon)
+                Refresh();
 
             if (!Verify(logon, false, true))
                 return;
 
             if (!IsGoodTime(logon))
             {
-                this.Log.OnEvent("Logon had bad sending time");
+                this.Log.OnEvent("Logon has bad sending time");
                 Disconnect("bad sending time");
                 return;
             }
@@ -981,9 +986,9 @@ public void SetResponder(IResponder responder)
             }
         }
 
-        /// FIXME
         public void Refresh()
         {
+            state_.Refresh();
         }
 
         [Obsolete("Use Reset(reason) instead.")]
@@ -1236,8 +1241,6 @@ protected bool GenerateLogon(Message otherLogon)
             logon.SetField(new Fields.EncryptMethod(0));
             if (this.SessionID.IsFIXT)
                 logon.SetField(new Fields.DefaultApplVerID(this.SenderDefaultApplVerID));
-            if (state_.ReceivedReset)
-                logon.SetField(new Fields.ResetSeqNumFlag(true));
             logon.SetField(new Fields.HeartBtInt(otherLogon.GetInt(Tags.HeartBtInt)));
             if (this.EnableLastMsgSeqNumProcessed)
                 logon.Header.SetField(new Fields.LastMsgSeqNumProcessed(otherLogon.Header.GetInt(Tags.MsgSeqNum)));
@@ -1577,8 +1580,6 @@ private bool IsAdminMessage(Message msg)
 
         protected bool SendRaw(Message message, int seqNum)
         {
-            string messageString;
-
             lock (sync_)
             {
                 string msgType = message.Header.GetField(Fields.Tags.MsgType);
@@ -1614,16 +1615,21 @@ protected bool SendRaw(Message message, int seqNum)
                     }
                 }
 
-                messageString = message.ToString();
+                string messageString = message.ToString();
                 if (0 == seqNum)
                     Persist(message, messageString);
+                return Send(messageString);
             }
-            return Send(messageString);
         }
 
         public void Dispose()
         {
             if (state_ != null) { state_.Dispose(); }
+            lock (sessions_)
+            {
+                sessions_.Remove(this.SessionID);
+            }
+
         }
     }
 }
diff --git a/QuickFIXn/SessionSettings.cs b/QuickFIXn/SessionSettings.cs
index a1c8f51ff..9c52fd03b 100755
--- a/QuickFIXn/SessionSettings.cs
+++ b/QuickFIXn/SessionSettings.cs
@@ -179,6 +179,21 @@ public void Set(QuickFix.Dictionary defaults)
                 entry.Value.Merge(defaults_);
         }
 
+        /// <summary>
+        /// Remove existing session config from the settings
+        /// </summary>
+        /// <param name="sessionID">ID of session for which config is to be removed</param>
+        /// <returns>true if removed, false if config for the session does not exist</returns>
+        public bool Remove(SessionID sessionID)
+        {
+            return settings_.Remove(sessionID);
+        }
+
+        /// <summary>
+        /// Add new session config
+        /// </summary>
+        /// <param name="sessionID">ID of session for which to add config</param>
+        /// <param name="settings">session config</param>
         public void Set(SessionID sessionID, QuickFix.Dictionary settings)
         {
             if (Has(sessionID))
diff --git a/QuickFIXn/ThreadedSocketAcceptor.cs b/QuickFIXn/ThreadedSocketAcceptor.cs
index a2cc39043..c76329991 100755
--- a/QuickFIXn/ThreadedSocketAcceptor.cs
+++ b/QuickFIXn/ThreadedSocketAcceptor.cs
@@ -48,6 +48,16 @@ public void AcceptSession(Session session)
                 acceptedSessions_[session.SessionID] = session;
             }
 
+            /// <summary>
+            /// Remove a session from those tied to this socket.
+            /// </summary>
+            /// <param name="sessionID">ID of session to be removed</param>
+            /// <returns>true if session removed, false if not found</returns>
+            public bool RemoveSession(SessionID sessionID)
+            {
+                return acceptedSessions_.Remove(sessionID);
+            }
+
             public Dictionary<SessionID, Session> GetAcceptedSessions()
             {
                 return new Dictionary<SessionID, Session>(acceptedSessions_);
@@ -56,6 +66,7 @@ public Dictionary<SessionID, Session> GetAcceptedSessions()
 
         private Dictionary<SessionID, Session> sessions_ = new Dictionary<SessionID, Session>();
         private Dictionary<IPEndPoint, AcceptorSocketDescriptor> socketDescriptorForAddress_ = new Dictionary<IPEndPoint, AcceptorSocketDescriptor>();
+        private SessionFactory sessionFactory_;
         private bool isStarted_ = false;
         private object sync_ = new object();
 
@@ -91,27 +102,19 @@ public ThreadedSocketAcceptor(SessionFactory sessionFactory, SessionSettings set
 
         private void CreateSessions(SessionSettings settings, SessionFactory sessionFactory)
         {
+            sessionFactory_ = sessionFactory;
             foreach (SessionID sessionID in settings.GetSessions())
             {
                 QuickFix.Dictionary dict = settings.Get(sessionID);
-                string connectionType = dict.GetString(SessionSettings.CONNECTION_TYPE);
-
-                if ("acceptor".Equals(connectionType))
-                {
-                    AcceptorSocketDescriptor descriptor = GetAcceptorSocketDescriptor(settings, sessionID);
-                    Session session = sessionFactory.Create(sessionID, dict);
-                    descriptor.AcceptSession(session);
-                    sessions_[sessionID] = session;
-                }
+                AddSession(sessionID, dict);
             }
 
             if (0 == socketDescriptorForAddress_.Count)
                 throw new ConfigError("No acceptor sessions found in SessionSettings.");
         }
 
-        private AcceptorSocketDescriptor GetAcceptorSocketDescriptor(SessionSettings settings, SessionID sessionID)
+        private AcceptorSocketDescriptor GetAcceptorSocketDescriptor(Dictionary dict)
         {
-            QuickFix.Dictionary dict = settings.Get(sessionID);
             int port = System.Convert.ToInt32(dict.GetLong(SessionSettings.SOCKET_ACCEPT_PORT));
             SocketSettings socketSettings = new SocketSettings();
 
@@ -142,6 +145,52 @@ private AcceptorSocketDescriptor GetAcceptorSocketDescriptor(SessionSettings set
             return descriptor;
         }
 
+        /// <summary>
+        /// Add new session, either at start-up or as an ad-hoc operation
+        /// </summary>
+        /// <param name="sessionID">ID of new session<param>
+        /// <param name="dict">config settings for new session</param></param>
+        /// <returns>true if session added successfully, false if session already exists or is not an acceptor</returns>
+        public bool AddSession(SessionID sessionID, Dictionary dict)
+        {
+            if (!sessions_.ContainsKey(sessionID))
+            {
+                string connectionType = dict.GetString(SessionSettings.CONNECTION_TYPE);
+                if ("acceptor" == connectionType)
+                {
+                    AcceptorSocketDescriptor descriptor = GetAcceptorSocketDescriptor(dict);
+                    Session session = sessionFactory_.Create(sessionID, dict);
+                    descriptor.AcceptSession(session);
+                    sessions_[sessionID] = session;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Ad-hoc removal of an existing session
+        /// </summary>
+        /// <param name="sessionID">ID of session to be removed</param>
+        /// <param name="terminateActiveSession">if true, force disconnection and removal of session even if it has an active connection</param>
+        /// <returns>true if session removed or not already present; false if could not be removed due to an active connection</returns>
+        public bool RemoveSession(SessionID sessionID, bool terminateActiveSession)
+        {
+            Session session = null;
+            if (sessions_.TryGetValue(sessionID, out session))
+            {
+                if (session.IsLoggedOn && !terminateActiveSession)
+                    return false;
+                session.Disconnect("Dynamic session removal");
+                foreach (AcceptorSocketDescriptor descriptor in socketDescriptorForAddress_.Values)
+                    if (descriptor.RemoveSession(sessionID))
+                        break;
+                sessions_.Remove(sessionID);
+                session.Dispose();
+            }
+            return true;
+        }
+
         private void StartAcceptingConnections()
         {
             lock (sync_)
diff --git a/QuickFIXn/Transport/SocketInitiator.cs b/QuickFIXn/Transport/SocketInitiator.cs
index 1ed81e13e..030c17fcd 100755
--- a/QuickFIXn/Transport/SocketInitiator.cs
+++ b/QuickFIXn/Transport/SocketInitiator.cs
@@ -166,6 +166,15 @@ protected override void OnStart()
             }
         }
 
+        /// <summary>
+        /// Ad-hoc session removal
+        /// </summary>
+        /// <param name="sessionID">ID of session being removed</param>
+        protected override void OnRemove(SessionID sessionID)
+        {
+            sessionToHostNum_.Remove(sessionID);
+        }
+
         protected override bool OnPoll(double timeout)
         {
             throw new NotImplementedException("FIXME - SocketInitiator.OnPoll not implemented!");
diff --git a/UnitTests/DictionaryTest.cs b/UnitTests/DictionaryTest.cs
index 7c8ae3380..77bd4f0af 100755
--- a/UnitTests/DictionaryTest.cs
+++ b/UnitTests/DictionaryTest.cs
@@ -58,7 +58,7 @@ public void GetDouble()
             System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("fr-FR");
 
             QuickFix.Dictionary d = new QuickFix.Dictionary();
-            d.SetString("DOUBLEKEY1","12.3");
+            d.SetString("DOUBLEKEY1", "12.3");
             d.SetString("DOUBLEKEY2", "987362.987362");
             d.SetString("BADDOUBLEKEY", "AB12.3");
             d.SetString("FOREIGNFORMAT", "44,44");
@@ -87,7 +87,7 @@ public void SetGetBool()
         public void SetGetDay()
         {
             QuickFix.Dictionary d = new QuickFix.Dictionary();
-            
+
             d.SetString("DAY1", "SU");
             d.SetString("DAY2", "MO");
             d.SetString("DAY3", "TU");
@@ -118,7 +118,7 @@ public void SetGetDay()
             Assert.That(d.GetDay("NEXTDAY6"), Is.EqualTo(System.DayOfWeek.Friday));
             Assert.That(d.GetDay("NEXTDAY7"), Is.EqualTo(System.DayOfWeek.Saturday));
         }
-        
+
         [Test]
         public void Merge()
         {
@@ -135,5 +135,32 @@ public void Merge()
             Assert.That(first.GetString("SECONDKEY"), Is.EqualTo("SECONDVALUE"));
             Assert.That(first.GetString("THIRDKEY"), Is.EqualTo("FIRST"));
         }
+
+        [Test]
+        public void ValueEquality()
+        {
+            QuickFix.Dictionary first = new QuickFix.Dictionary("Name");
+            QuickFix.Dictionary second = new QuickFix.Dictionary("Name");
+            Assert.True(first.Equals(second));
+
+            first.SetString("THIRDKEY", "FIRST");
+            second.SetString("THIRDKEY", "SECOND");
+            Assert.False(first.Equals(second));
+
+            first.SetString("THIRDKEY", "SECOND");
+            Assert.True(first.Equals(second));
+
+            first.SetString("FIRSTKEY", "FIRSTVALUE");
+            second.SetString("SECONDKEY", "SECONDVALUE");
+            Assert.False(first.Equals(second));
+
+            first.SetString("SECONDKEY", "SECONDVALUE");
+            second.SetString("FIRSTKEY", "FIRSTVALUE");
+            Assert.True(first.Equals(second));
+
+            QuickFix.Dictionary third = new QuickFix.Dictionary("Name1");
+            QuickFix.Dictionary fourth = new QuickFix.Dictionary("Name2");
+            Assert.False(third.Equals(fourth));
+        }
     }
 }
diff --git a/UnitTests/SessionDynamicTest.cs b/UnitTests/SessionDynamicTest.cs
new file mode 100644
index 000000000..3f3f01e6f
--- /dev/null
+++ b/UnitTests/SessionDynamicTest.cs
@@ -0,0 +1,407 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Net;
+using System.Net.Sockets;
+using System.Text.RegularExpressions;
+
+using NUnit.Framework;
+using QuickFix;
+using QuickFix.Transport;
+
+namespace UnitTests
+{
+    [TestFixture]
+    class SessionDynamicTest
+    {
+        public class TestApplication : IApplication
+        {
+            Action<string> _logonNotify;
+            Action<string> _logoffNotify;
+            public TestApplication(Action<string> logonNotify, Action<string> logoffNotify)
+            {
+                _logonNotify = logonNotify;
+                _logoffNotify = logoffNotify;
+            }
+            public void FromAdmin(Message message, SessionID sessionID)
+            { }
+
+            public void FromApp(Message message, SessionID sessionID)
+            { }
+
+            public void OnCreate(SessionID sessionID) { }
+            public void OnLogout(SessionID sessionID)
+            {
+                _logoffNotify(sessionID.TargetCompID);
+            }
+            public void OnLogon(SessionID sessionID)
+            {
+                _logonNotify(sessionID.TargetCompID);
+            }
+
+            public void ToAdmin(Message message, SessionID sessionID) { }
+            public void ToApp(Message message, SessionID sessionID) { }
+        }
+        class SocketState
+        {
+            public SocketState(Socket s)
+            {
+                _socket = s;
+            }
+            public Socket _socket;
+            public byte[] _rxBuffer = new byte[1024];
+            public string _messageFragment = string.Empty;
+            public string _exMessage;
+        }
+
+        const string Host = "127.0.0.1";
+        const int ConnectPort = 55100;
+        const int AcceptPort = 55101;
+        const string ServerCompID = "dummy";
+        const string StaticInitiatorCompID = "ini01";
+        const string StaticAcceptorCompID = "acc01";
+
+        const string FIXMessageEnd = @"\x0110=\d{3}\x01";
+        const string FIXMessageDelimit = @"(8=FIX|\A).*?(" + FIXMessageEnd + @"|\z)";
+
+        SocketInitiator _initiator;
+        ThreadedSocketAcceptor _acceptor;
+        Dictionary<string, SocketState> _sessions;
+        HashSet<string> _loggedOnCompIDs;
+        Socket _listenSocket;
+
+        Dictionary CreateSessionConfig(string targetCompID, bool isInitiator)
+        {
+            Dictionary settings = new Dictionary();
+            settings.SetString(SessionSettings.CONNECTION_TYPE, isInitiator ? "initiator" : "acceptor");
+            settings.SetString(SessionSettings.USE_DATA_DICTIONARY, "N");
+            settings.SetString(SessionSettings.START_TIME, "12:00:00");
+            settings.SetString(SessionSettings.END_TIME, "12:00:00");
+            settings.SetString(SessionSettings.HEARTBTINT, "300");
+            settings.SetString(SessionSettings.SOCKET_CONNECT_HOST, Host);
+            settings.SetString(SessionSettings.SOCKET_CONNECT_PORT, ConnectPort.ToString());
+            settings.SetString(SessionSettings.SOCKET_ACCEPT_HOST, Host);
+            settings.SetString(SessionSettings.SOCKET_ACCEPT_PORT, AcceptPort.ToString());
+            return settings;
+        }
+
+        SessionID CreateSessionID(string targetCompID)
+        {
+            return new SessionID(QuickFix.Values.BeginString_FIX42, ServerCompID, targetCompID);
+        }
+
+        void LogonCallback(string compID)
+        {
+            lock (_loggedOnCompIDs)
+            {
+                _loggedOnCompIDs.Add(compID);
+                Monitor.Pulse(_loggedOnCompIDs);
+            }
+        }
+         void LogoffCallback(string compID)
+        {
+            lock (_loggedOnCompIDs)
+            {
+                _loggedOnCompIDs.Remove(compID);
+                Monitor.Pulse(_loggedOnCompIDs);
+            }
+        }
+
+        void StartEngine(bool initiator)
+        {
+            TestApplication application = new TestApplication(LogonCallback, LogoffCallback);
+            IMessageStoreFactory storeFactory = new MemoryStoreFactory();
+            ILogFactory logFactory = new ScreenLogFactory(false, false, false);
+            SessionSettings settings = new SessionSettings();
+
+            if (initiator)
+            {
+                Dictionary defaults = new Dictionary();
+                defaults.SetString(SessionSettings.RECONNECT_INTERVAL, "1");
+                settings.Set(defaults);
+                settings.Set(CreateSessionID(StaticInitiatorCompID), CreateSessionConfig(StaticInitiatorCompID, true));
+                _initiator = new SocketInitiator(application, storeFactory, settings, logFactory);
+                _initiator.Start();
+            }
+            else
+            {
+                settings.Set(CreateSessionID(StaticAcceptorCompID), CreateSessionConfig(StaticAcceptorCompID, false));
+                _acceptor = new ThreadedSocketAcceptor(application, storeFactory, settings, logFactory);
+                _acceptor.Start();
+            }
+        }
+
+        void StartListener()
+        {
+            var address = IPAddress.Parse(Host);
+            var listenEndpoint = new IPEndPoint(address, ConnectPort);
+            _listenSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            _listenSocket.Bind(listenEndpoint);
+            _listenSocket.Listen(10);
+           _listenSocket.BeginAccept(new AsyncCallback(ProcessInboundConnect), null);
+        }
+
+        void ProcessInboundConnect(IAsyncResult ar)
+        {
+            Socket handler = null;
+            try
+            {
+                handler = _listenSocket.EndAccept(ar);
+            }
+            catch
+            {
+                _listenSocket = null; // Assume listener has been closed
+            }
+
+            if (handler != null)
+            {
+                ReceiveAsync(new SocketState(handler));
+                _listenSocket.BeginAccept(new AsyncCallback(ProcessInboundConnect), null);
+            }
+        }
+
+        void ProcessRXData(IAsyncResult ar)
+        {
+            SocketState socketState = (SocketState)ar.AsyncState;
+            int bytesReceived  = 0;
+            try
+            {
+                bytesReceived = socketState._socket.EndReceive(ar);
+            }
+            catch (Exception ex)
+            {
+                socketState._exMessage = ex.InnerException == null ? ex.Message : ex.InnerException.Message;
+            }
+
+            if (bytesReceived == 0)
+            {
+                socketState._socket.Close();
+                lock (socketState._socket)
+                    Monitor.Pulse(socketState._socket);
+                return;
+            }
+            string msgText = Encoding.ASCII.GetString(socketState._rxBuffer, 0, bytesReceived);
+            foreach (Match m in Regex.Matches(msgText, FIXMessageDelimit))
+            {
+                socketState._messageFragment += m.Value;
+                if (Regex.IsMatch(socketState._messageFragment, FIXMessageEnd))
+                {
+                    Message message = new Message(socketState._messageFragment);
+                    socketState._messageFragment = string.Empty;
+                    string targetCompID = message.Header.GetField(QuickFix.Fields.Tags.TargetCompID);
+                    if (message.Header.GetField(QuickFix.Fields.Tags.MsgType) == QuickFix.Fields.MsgType.LOGON)
+                        lock (_sessions)
+                        {
+                            _sessions[targetCompID] = socketState;
+                           Monitor.Pulse(_sessions);
+                        }
+                }
+            }
+            ReceiveAsync(socketState);
+        }
+
+        void ReceiveAsync(SocketState socketState)
+        {
+             socketState._socket.BeginReceive(socketState._rxBuffer, 0, socketState._rxBuffer.Length, SocketFlags.None, new AsyncCallback(ProcessRXData), socketState);;
+        }
+
+        Socket ConnectToEngine()
+        {
+            var address = IPAddress.Parse(Host);
+            var endpoint = new IPEndPoint(address, AcceptPort);
+            var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            try
+            {
+                socket.Connect(endpoint);
+                ReceiveAsync(new SocketState(socket));
+                return socket;
+            }
+            catch (Exception ex)
+            {
+                Assert.Fail(string.Format("Failed to connect: {0}", ex.Message));
+                return null;
+            }
+        }
+
+        Socket GetSocket(string compID)
+        {
+            lock (_sessions)
+                return _sessions[compID]._socket;
+        }
+
+        bool WaitForLogonStatus(string targetCompID)
+        {
+            lock (_loggedOnCompIDs)
+            {
+                if (!_loggedOnCompIDs.Contains(targetCompID))
+                    Monitor.Wait(_loggedOnCompIDs, 10000);
+                return _loggedOnCompIDs.Contains(targetCompID);
+            }
+        }
+
+        bool WaitForLogonMessage(string targetCompID)
+        {
+            lock (_sessions)
+            {
+                if (!_sessions.ContainsKey(targetCompID))
+                    Monitor.Wait(_sessions, 10000);
+                return _sessions.ContainsKey(targetCompID);
+            }
+        }
+
+        bool WaitForDisconnect(Socket s)
+        {
+            lock (s)
+            {
+                if (s.Connected)
+                    Monitor.Wait(s, 10000);
+                return !s.Connected;
+            }
+        }
+
+        bool WaitForDisconnect(string compID)
+        {
+            return WaitForDisconnect(GetSocket(compID));
+        }
+
+        bool HasReceivedMessage(string compID)
+        {
+            lock (_sessions)
+                return _sessions.ContainsKey(compID);
+        }
+
+        bool IsLoggedOn(string compID)
+        {
+            lock (_loggedOnCompIDs)
+                return _loggedOnCompIDs.Contains(compID);
+        }
+
+        void SendInitiatorLogon(string senderCompID)
+        {
+            SendLogon(GetSocket(senderCompID), senderCompID);
+        }
+
+        void SendLogon(Socket s, string senderCompID)
+        {
+            var msg = new QuickFix.FIX42.Logon();
+            msg.Header.SetField(new QuickFix.Fields.TargetCompID(ServerCompID));
+            msg.Header.SetField(new QuickFix.Fields.SenderCompID(senderCompID));
+            msg.Header.SetField(new QuickFix.Fields.MsgSeqNum(1));
+            msg.Header.SetField(new QuickFix.Fields.SendingTime(System.DateTime.UtcNow));
+            msg.SetField(new QuickFix.Fields.HeartBtInt(300));
+            s.Send(Encoding.ASCII.GetBytes(msg.ToString()));
+        }
+
+        [SetUp]
+        public void Setup()
+        {
+            _sessions = new Dictionary<string, SocketState>();
+            _loggedOnCompIDs = new HashSet<string>();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            if (_listenSocket != null)
+                _listenSocket.Close();
+            if (_initiator != null)
+                _initiator.Stop(true);
+            if (_acceptor != null)
+                _acceptor.Stop(true);
+
+            _initiator = null;
+            _acceptor = null;
+        }
+
+        [Test]
+        public void DynamicAcceptor()
+        {
+            StartEngine(false);
+
+            // Ensure we can log on statically (normally) configured acceptor
+            var socket01 = ConnectToEngine();
+            SendLogon(socket01, StaticAcceptorCompID);
+            Assert.IsTrue(WaitForLogonStatus(StaticAcceptorCompID), "Failed to logon static acceptor session");
+
+            // Ensure that attempt to log on as yet un-added dynamic acceptor fails
+            var socket02 = ConnectToEngine();
+            string dynamicCompID = "acc10";
+            SendLogon(socket02, dynamicCompID);
+            Assert.IsTrue(WaitForDisconnect(socket02), "Server failed to disconnect unconfigured CompID");
+            Assert.False(HasReceivedMessage(dynamicCompID), "Unexpected message received for unconfigured CompID");
+
+            // Add the dynamic acceptor and ensure that we can now log on
+            var sessionID = CreateSessionID(dynamicCompID);
+            Assert.IsTrue(_acceptor.AddSession(sessionID, CreateSessionConfig(dynamicCompID, false)), "Failed to add dynamic session to acceptor");
+            var socket03 = ConnectToEngine();
+            SendLogon(socket03, dynamicCompID);
+            Assert.IsTrue(WaitForLogonStatus(dynamicCompID), "Failed to logon dynamic acceptor session");
+
+            // Now that dynamic acceptor is logged on, ensure that unforced attempt to remove session fails
+            Assert.IsFalse(_acceptor.RemoveSession(sessionID, false), "Unexpected success removing active session");
+            Assert.IsTrue(socket03.Connected, "Unexpected loss of connection");
+
+            // Ensure that forced attempt to remove session dynamic session succeeds, even though it is in logged on state
+            Assert.IsTrue(_acceptor.RemoveSession(sessionID, true), "Failed to remove active session");
+            Assert.IsTrue(WaitForDisconnect(socket03), "Socket still connected after session removed");
+            Assert.IsFalse(IsLoggedOn(dynamicCompID), "Session still logged on after being removed");
+
+            // Ensure that we can perform unforced removal of a dynamic session that is not logged on.
+            string dynamicCompID2 = "acc20";
+            var sessionID2 = CreateSessionID(dynamicCompID2);
+            Assert.IsTrue(_acceptor.AddSession(sessionID2, CreateSessionConfig(dynamicCompID2, false)), "Failed to add dynamic session to acceptor");
+            Assert.IsTrue(_acceptor.RemoveSession(sessionID2, false), "Failed to remove inactive session");
+
+            // Ensure that we can remove statically configured session
+            Assert.IsTrue(IsLoggedOn(StaticAcceptorCompID), "Unexpected logoff");
+            Assert.IsTrue(_acceptor.RemoveSession(CreateSessionID(StaticAcceptorCompID), true), "Failed to remove active session");
+            Assert.IsTrue(WaitForDisconnect(socket01), "Socket still connected after session removed");
+            Assert.IsFalse(IsLoggedOn(StaticAcceptorCompID), "Session still logged on after being removed");
+        }
+
+        [Test]
+        public void DynamicInitiator()
+        {
+            StartListener();
+            StartEngine(true);
+
+            // Ensure we can log on statically (normally) configured initiator
+            Assert.IsTrue(WaitForLogonMessage(StaticInitiatorCompID),  "Failed to get logon message for static initiator session");
+            SendInitiatorLogon(StaticInitiatorCompID);
+
+            // Add the dynamic initator and ensure that we can log on
+            string dynamicCompID = "ini10";
+            var sessionID = CreateSessionID(dynamicCompID);
+            Assert.IsTrue(_initiator.AddSession(sessionID, CreateSessionConfig(dynamicCompID, true)), "Failed to add dynamic session to initiator");
+            Assert.IsTrue(WaitForLogonMessage(dynamicCompID), "Failed to get logon message for dynamic initiator session");
+            SendInitiatorLogon(dynamicCompID);
+            Assert.IsTrue(WaitForLogonStatus(dynamicCompID), "Failed to logon dynamic initiator session");
+
+            // Now that dynamic initiator is logged on, ensure that unforced attempt to remove session fails
+            Assert.IsFalse(_initiator.RemoveSession(sessionID, false), "Unexpected success removing active session");
+            Assert.IsTrue(IsLoggedOn(dynamicCompID), "Unexpected logoff");
+
+            // Ensure that forced attempt to remove session dynamic session succeeds, even though it is in logged on state
+            Assert.IsTrue(_initiator.RemoveSession(sessionID, true), "Failed to remove active session");
+            Assert.IsTrue(WaitForDisconnect(dynamicCompID), "Socket still connected after session removed");
+            Assert.IsFalse(IsLoggedOn(dynamicCompID), "Session still logged on after being removed");
+
+            // Ensure that we can perform unforced removal of a dynamic session that is not logged on.
+            string dynamicCompID2 = "ini20";
+            var sessionID2 = CreateSessionID(dynamicCompID2);
+            Assert.IsTrue(_initiator.AddSession(sessionID2, CreateSessionConfig(dynamicCompID2, true)), "Failed to add dynamic session to initiator");
+            Assert.IsTrue(WaitForLogonMessage(dynamicCompID2), "Failed to get logon message for dynamic initiator session");
+            Assert.IsFalse(IsLoggedOn(dynamicCompID2), "Session logged on");
+            Assert.IsTrue(_initiator.RemoveSession(sessionID2, false), "Failed to remove inactive session");
+            Assert.IsTrue(WaitForDisconnect(dynamicCompID2), "Socket still connected after session removed");
+
+            // Ensure that we can remove statically configured session
+            Assert.IsTrue(IsLoggedOn(StaticInitiatorCompID), "Unexpected loss of connection");
+            Assert.IsTrue(_initiator.RemoveSession(CreateSessionID(StaticInitiatorCompID), true), "Failed to remove active session");
+            Assert.IsTrue(WaitForDisconnect(StaticInitiatorCompID), "Socket still connected after session removed");
+            Assert.IsFalse(IsLoggedOn(StaticInitiatorCompID), "Session still logged on after being removed");
+        }
+    }
+}
diff --git a/UnitTests/SessionTest.cs b/UnitTests/SessionTest.cs
index 328b684cf..444140cc8 100755
--- a/UnitTests/SessionTest.cs
+++ b/UnitTests/SessionTest.cs
@@ -112,8 +112,49 @@ public void OnLogout(QuickFix.SessionID sessionID)
         public void OnLogon(QuickFix.SessionID sessionID)
         {
         }
+        #endregion
+    }
+
+    class MockApplicationExt : QuickFix.IApplicationExt
+    {
+        public HashSet<string> InterceptedMessageTypes = new HashSet<string>();
+
+        #region Application Members
+
+        public void ToAdmin(QuickFix.Message message, QuickFix.SessionID sessionID)
+        {
+        }
+
+        public void FromAdmin(QuickFix.Message message, QuickFix.SessionID sessionID)
+        {
+        }
+
+        public void ToApp(QuickFix.Message message, QuickFix.SessionID sessionId)
+        {
+        }
+
+        public void FromApp(QuickFix.Message message, QuickFix.SessionID sessionID)
+        {
+        }
+
+        public void OnCreate(QuickFix.SessionID sessionID)
+        {
+        }
+
+        public void OnLogout(QuickFix.SessionID sessionID)
+        {
+        }
 
+        public void OnLogon(QuickFix.SessionID sessionID)
+        {
+        }
+
+        public void FromEarlyIntercept(QuickFix.Message message, QuickFix.SessionID sessionID)
+        {
+            InterceptedMessageTypes.Add(message.Header.GetString(QuickFix.Fields.Tags.MsgType));
+        }
         #endregion
+
     }
 
     [TestFixture]
@@ -126,6 +167,7 @@ public class SessionTest
         MockApplication application = null;
         QuickFix.Session session = null;
         QuickFix.Session session2 = null;
+        QuickFix.Dictionary config = null;
         int seqNum = 1;
         Regex msRegex = new Regex(@"\.[\d]{1,3}$");
 
@@ -137,7 +179,7 @@ public void setup()
             application = new MockApplication();
             settings = new QuickFix.SessionSettings();
 
-            QuickFix.Dictionary config = new QuickFix.Dictionary();
+            config = new QuickFix.Dictionary();
             config.SetBool(QuickFix.SessionSettings.PERSIST_MESSAGES, false);
             config.SetString(QuickFix.SessionSettings.CONNECTION_TYPE, "initiator");
             config.SetString(QuickFix.SessionSettings.START_TIME, "00:00:00");
@@ -719,5 +761,35 @@ public void TestToAppResendDoNotSend()
             SendResendRequest(1, 0);
             Assert.False(SENT_NOS());
         }
+
+
+        [Test]
+        public void TestApplicationExtension()
+        {
+            var mockApp = new MockApplicationExt();
+            session = new QuickFix.Session(mockApp, new QuickFix.MemoryStoreFactory(), sessionID,
+                new QuickFix.DataDictionaryProvider(), new QuickFix.SessionSchedule(config), 0, new QuickFix.ScreenLogFactory(settings), new QuickFix.DefaultMessageFactory(), "blah");
+            session.SetResponder(responder);
+            session.CheckLatency = false;
+
+            Logon();
+            QuickFix.FIX42.NewOrderSingle order = new QuickFix.FIX42.NewOrderSingle(
+                new QuickFix.Fields.ClOrdID("1"),
+                new QuickFix.Fields.HandlInst(QuickFix.Fields.HandlInst.MANUAL_ORDER),
+                new QuickFix.Fields.Symbol("IBM"),
+                new QuickFix.Fields.Side(QuickFix.Fields.Side.BUY),
+                new QuickFix.Fields.TransactTime(),
+                new QuickFix.Fields.OrdType(QuickFix.Fields.OrdType.LIMIT));
+
+            order.Header.SetField(new QuickFix.Fields.TargetCompID(sessionID.SenderCompID));
+            order.Header.SetField(new QuickFix.Fields.SenderCompID(sessionID.TargetCompID));
+            order.Header.SetField(new QuickFix.Fields.MsgSeqNum(2));
+
+            session.Next(order);
+
+            Assert.That(mockApp.InterceptedMessageTypes.Count, Is.EqualTo(2));
+            Assert.True(mockApp.InterceptedMessageTypes.Contains(QuickFix.Fields.MsgType.LOGON));
+            Assert.True(mockApp.InterceptedMessageTypes.Contains(QuickFix.Fields.MsgType.NEWORDERSINGLE));
+        }
     }
 }
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index f664c6e66..cc1610546 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -98,6 +98,7 @@
     <Compile Include="MessageTests.cs" />
     <Compile Include="ParserTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SessionDynamicTest.cs" />
     <Compile Include="SessionFactoryTest.cs" />
     <Compile Include="SessionIDTest.cs" />
     <Compile Include="SessionScheduleTests.cs" />
diff --git a/acceptance_test.bat b/acceptance_test.bat
index ae4db993e..7dd1d1ed3 100755
--- a/acceptance_test.bat
+++ b/acceptance_test.bat
@@ -5,6 +5,7 @@ set RESULT41=
 set RESULT42=
 set RESULT43=
 set RESULT44=
+set RESULT44_NORESET=
 set RESULT50=
 set RESULT50SP1=
 set RESULT50SP2=
@@ -48,7 +49,14 @@ pushd AcceptanceTest
     if ERRORLEVEL 1 set RESULT44=1
     echo "44 tests result: %RESULT44%"
     copy TestResult.xml AcceptanceTests_44.xml
-    
+
+    call pause
+    del TestResult.xml
+    call runat release 5005 definitions/server/fix44noreset/*.def cfg/at_44_noreset.cfg
+    if ERRORLEVEL 1 set RESULT44_NORESET=1
+    echo "44 tests result: %RESULT44_NORESET%"
+    copy TestResult.xml AcceptanceTests_44_noreset.xml
+
     call pause
     del TestResult.xml
     call runat release 5006 definitions/server/fix50/*.def cfg/at_50.cfg
@@ -86,12 +94,14 @@ echo "    41: %RESULT41%"
 echo "    42: %RESULT42%"
 echo "    43: %RESULT43%"
 echo "    44: %RESULT44%"
+echo "  44nr: %RESULT44_NORESET%"
 echo "    50: %RESULT50%"
 echo "50 SP1: %RESULT50SP1%"
 echo "50 SP2: %RESULT50SP2%"
 echo "  MISC: %RESULTMISC%"
 
-set /a RETURNVALUE=RESULT40+RESULT41+RESULT42+RESULT43+RESULT44+RESULT50+RESULT50SP1+RESULT50SP2+RESULTMISC
+set /a RETURNVALUE=RESULT40+RESULT41+RESULT42+RESULT43+RESULT44+RESULT44_NORESET+RESULT50+RESULT50SP1+RESULT50SP2+RESULTMISC
 
 echo "Script returns: %RETURNVALUE%"
+echo "(0 means success)"
 exit /B %RETURNVALUE%
diff --git a/web/views/about/credits.md b/web/views/about/credits.md
index 6fb10ca88..9b200c10c 100644
--- a/web/views/about/credits.md
+++ b/web/views/about/credits.md
@@ -46,4 +46,5 @@ Contributors
 - Jac Steyn
 - Timothy Caro
 - Steffan Ulfburg
+- Martin Adams