tatus

diff --git a/sample/LeadSample/LeadSample.csproj b/sample/LeadSample/LeadSample.csproj
index aeff46d..8b48001 100644
--- a/sample/LeadSample/LeadSample.csproj
+++ b/sample/LeadSample/LeadSample.csproj
@@ -43,6 +43,8 @@
     <Compile Include="MailAction.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="WorkflowEnded.cs" />
+    <Compile Include="WorkflowStarted.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Stateflow\Stateflow.csproj">
diff --git a/sample/LeadSample/Program.cs b/sample/LeadSample/Program.cs
index 9bbc49d..40e438a 100644
--- a/sample/LeadSample/Program.cs
+++ b/sample/LeadSample/Program.cs
@@ -28,7 +28,8 @@ public void CreateStateMachine()
 					new State
 					{
 						Name = "Created",
-						DisplayName = "Lead Created"
+						DisplayName = "Lead Created",
+						ExitActions = new List<IAction> { new WorkflowStarted() }
 					},
 
 					 new State
@@ -50,7 +51,8 @@ public void CreateStateMachine()
 					 new State
 					{
 						Name = "Closed",
-						DisplayName = "Lead is Closed"
+						DisplayName = "Lead is Closed",
+						EntryActions = new List<IAction> { new WorkflowEnded() }
 					} 
 				},
 				Triggers = new List<Trigger>
@@ -183,7 +185,6 @@ public void CreateStateMachine()
 
 	public class LeadExpressionCondition : ExpressionCondition
 	{
-
 		public LeadExpressionCondition(string expression)
 			: base(expression)
 		{
diff --git a/src/Stateflow/Workflow/WorkflowDefinition.cs b/src/Stateflow/Workflow/WorkflowDefinition.cs
index cc38c42..05ab540 100644
--- a/src/Stateflow/Workflow/WorkflowDefinition.cs
+++ b/src/Stateflow/Workflow/WorkflowDefinition.cs
@@ -6,19 +6,19 @@
 
 namespace Stateflow.Workflow
 {
-    /// <summary>
-    /// Defines a workflow.
-    /// </summary>
-    public class WorkflowDefinition
-    {
+	/// <summary>
+	/// Defines a workflow.
+	/// </summary>
+	public class WorkflowDefinition
+	{
 
-        /// <summary>
-        /// Gets or sets the name of this workflow.
-        /// </summary>
-        /// <value>
-        /// The name.
-        /// </value>
-        public string Name { get; set; }
+		/// <summary>
+		/// Gets or sets the name of this workflow.
+		/// </summary>
+		/// <value>
+		/// The name.
+		/// </value>
+		public string Name { get; set; }
 
 		/// <summary>
 		///  The current version of this workflow definition
@@ -29,66 +29,66 @@ public class WorkflowDefinition
 			set;
 		}
 
-        /// <summary>
-        /// Gets or sets the description of this workflow
-        /// </summary>
-        /// <value>
-        /// The description.
-        /// </value>
-        public string Description { get; set; }
+		/// <summary>
+		/// Gets or sets the description of this workflow
+		/// </summary>
+		/// <value>
+		/// The description.
+		/// </value>
+		public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the states. States define the workflow. Like a Create state, an Assigned state etc.
-        /// Each state can have an entry and exit action(s).
-        /// </summary>
-        /// <value>
-        /// The states.
-        /// </value>
-        public IList<State> States { get; set; }
+		/// <summary>
+		/// Gets or sets the states. States define the workflow. Like a Create state, an Assigned state etc.
+		/// Each state can have an entry and exit action(s).
+		/// </summary>
+		/// <value>
+		/// The states.
+		/// </value>
+		public IList<State> States { get; set; }
 
-        /// <summary>
-        /// Gets or sets the triggers. A trigger can be used to move from state to state. Like Rejecting, Accepting, Closing.
-        /// </summary>
-        /// <value>
-        /// The triggers.
-        /// </value>
-        public IList<Trigger> Triggers { get; set; }
+		/// <summary>
+		/// Gets or sets the triggers. A trigger can be used to move from state to state. Like Rejecting, Accepting, Closing.
+		/// </summary>
+		/// <value>
+		/// The triggers.
+		/// </value>
+		public IList<Trigger> Triggers { get; set; }
 
-        /// <summary>
-        /// Gets or sets the transitions. A transition describes from which source state to destination state the workflow can move based on a certain trigger.
-        /// For example; from the state Review, using accept, to the state Accepted. 
-        /// Conditions can be used to guard the state transfer.
-        /// </summary>
-        /// <value>
-        /// The transitions.
-        /// </value>
-        public IList<Transition> Transitions { get; set; }
+		/// <summary>
+		/// Gets or sets the transitions. A transition describes from which source state to destination state the workflow can move based on a certain trigger.
+		/// For example; from the state Review, using accept, to the state Accepted. 
+		/// Conditions can be used to guard the state transfer.
+		/// </summary>
+		/// <value>
+		/// The transitions.
+		/// </value>
+		public IList<Transition> Transitions { get; set; }
 
-        /// <summary>
-        /// Serializes this instance to a json string value.
-        /// </summary>
-        /// <returns>A json serialization.</returns>
-        public string Serialize()
-        {
-            return JsonConvert.SerializeObject(this, new JsonSerializerSettings
-            {
-                ContractResolver = new CamelCasePropertyNamesContractResolver(),
-                Formatting = Formatting.Indented
-            });
-        }
+		/// <summary>
+		/// Serializes this instance to a json string value.
+		/// </summary>
+		/// <returns>A json serialization.</returns>
+		public string Serialize()
+		{
+			return JsonConvert.SerializeObject(this, new JsonSerializerSettings
+			{
+				ContractResolver = new CamelCasePropertyNamesContractResolver(),
+				Formatting = Formatting.Indented
+			});
+		}
 
-        /// <summary>
-        /// Converts the json back into a workflow definition.
-        /// </summary>
-        /// <param name="json">The json representation.</param>
-        /// <returns>A workflow definition.</returns>
-        public static WorkflowDefinition Deserialize(string json)
-        {
-            Enforce.ArgumentNotNull(json, "json");
+		/// <summary>
+		/// Converts the json back into a workflow definition.
+		/// </summary>
+		/// <param name="json">The json representation.</param>
+		/// <returns>A workflow definition.</returns>
+		public static WorkflowDefinition Deserialize(string json)
+		{
+			Enforce.ArgumentNotNull(json, "json");
 
-            return JsonConvert.DeserializeObject<WorkflowDefinition>(json);
-        }
+			return JsonConvert.DeserializeObject<WorkflowDefinition>(json);
+		}
 
 
-    }
+	}
 }
\ No newline at end of file
diff --git a/src/Stateflow/Workflow/WorkflowEntity.cs b/src/Stateflow/Workflow/WorkflowEntity.cs
index 910d788..2a85f54 100644
--- a/src/Stateflow/Workflow/WorkflowEntity.cs
+++ b/src/Stateflow/Workflow/WorkflowEntity.cs
@@ -55,7 +55,6 @@ private void ToStateMachine(WorkflowDefinition workflowDefinition, string curren
                         _stateMachine.Configure(state)
                             .PermitIf(trig.Trigger, trig.TargetState, ConditionalGuard(trig.Conditions));
 
-
                 });
 
                 var ws = workflowDefinition.States.First(a => a.Name == state);
@@ -109,12 +108,12 @@ private Func<bool> ConditionalGuard(IEnumerable<ICondition> conditions)
         /// <summary>
         /// Changes the current state to a new state.
         /// </summary>
-        /// <param name="newState">The new state.</param>
-        public virtual void ChangeState(string newState)
+		/// <param name="trigger">The new state.</param>
+        public virtual void ChangeState(string trigger)
         {
-            Enforce.ArgumentNotNull(newState, "newState");
+			Enforce.ArgumentNotNull(trigger, "newState");
 
-            _stateMachine.Fire(newState);
+			_stateMachine.Fire(trigger);
         }
 
         /// <summary>