diff --git a/sdk/applications/actionstatemachine/ActionState.cpp b/sdk/applications/actionstatemachine/ActionState.cpp
index c041c3e5b4d0ffab443f0490ad91bd6ca26ee8b7..7fc6382ec48f7a0c3c854fbf2bdc7bfe54e8cb18 100644
--- a/sdk/applications/actionstatemachine/ActionState.cpp
+++ b/sdk/applications/actionstatemachine/ActionState.cpp
@@ -213,27 +213,29 @@ void ActionState::onEntry(QEvent* event) {
         }
 
         // log the parameters
-        (*logStream) << "\t\t\t<name>" << myAction->getName() << "</name>" << endl;
+        (*logStream) << "\t\t<actionName>" << myAction->getName() << "</actionName>" << endl;
         // Properties
         int nbStaticProps = myAction->metaObject()->propertyCount();
         QList<QByteArray> propertyNames = myAction->dynamicPropertyNames();
         // static properties
         if ((nbStaticProps > 0) || (! propertyNames.isEmpty())) {
-            (*logStream) << "\t\t\t<parameters>" << endl;
+            (*logStream) << "\t\t<parameters>" << endl;
             for (int index = 0 ; index < nbStaticProps; index++) {
                 QString staticPropName = myAction->metaObject()->property(index).name();
-                (*logStream) << "\t\t\t\t<parameter name='";
-                (*logStream) << staticPropName << "' value='";
-                (*logStream) << myAction->property(staticPropName.toStdString().c_str()).toString() ;
-                (*logStream) << "' static='true'/>" << endl;
+                if (staticPropName != "objectName") {
+                    (*logStream) << "\t\t\t<parameter name='";
+                    (*logStream) << staticPropName << "' value='";
+                    (*logStream) << myAction->property(staticPropName.toStdString().c_str()).toString() ;
+                    (*logStream) << "' static='true'/>" << endl;
+                }
             }
 
             // dynamic properties
             for (QList<QByteArray>::const_iterator it = propertyNames.begin(); it != propertyNames.end(); it++) {
-                (*logStream) << "\t\t\t\t<parameter name='";
+                (*logStream) << "\t\t\t<parameter name='";
                 (*logStream) << (*it) << "' value='" << myAction->property(*it).toString() << "'/>" << endl;
             }
-            (*logStream) << "\t\t\t</parameters>" << endl;
+            (*logStream) << "\t\t</parameters>" << endl;
         }
 
 
@@ -244,7 +246,7 @@ void ActionState::onEntry(QEvent* event) {
 
         // log inputs
         if (inputComponentNames.size() > 0) {
-            (*logStream) << "\t\t\t<inputs>" << endl;
+            (*logStream) << "\t\t<inputs>" << endl;
         }
 
         // search for proper input considering name and type
@@ -260,14 +262,14 @@ void ActionState::onEntry(QEvent* event) {
             }
 
             if (compIt != allComps.end()) {
-                (*logStream) << "\t\t\t\t<component name='";
+                (*logStream) << "\t\t\t<component name='";
                 (*logStream) << (*compIt)->getName() << "' type='" << compType << "'/>" << endl;
                 inputComps.append((*compIt));
             }
         }
 
         if (inputComponentNames.size() > 0) {
-            (*logStream) << "\t\t\t</inputs>" << endl;
+            (*logStream) << "\t\t</inputs>" << endl;
         }
 
         myAction->setInputComponents(inputComps);
@@ -299,7 +301,7 @@ void ActionState::onExit(QEvent* event) {
         QTime endTime = QTime::currentTime();
         (*logStream) << "\t\t<!-- exiting " << this->name << " -->" << endl;
         (*logStream) << "\t\t<endTime>" << endTime.toString("hh:mm:ss:zzz") << "</endTime>" << endl;
-        (*logStream) << "\t\t<timeEnlapsed unit='ms'>" << (startTime->elapsed()) << "</timeEnlapsed>" << endl;
+        (*logStream) << "\t\t<timeElapsed unit='ms'>" << (startTime->elapsed()) << "</timeElapsed>" << endl;
         (*logStream) << "\t</state>" << endl;
     }
 }
diff --git a/sdk/applications/actionstatemachine/ActionStateMachine.cpp b/sdk/applications/actionstatemachine/ActionStateMachine.cpp
index 43ef997f1ea1db3f4382325b7d0e90800b270c60..6e8fdf3366ac23c544c9bdcc924d80073b5f1f09 100644
--- a/sdk/applications/actionstatemachine/ActionStateMachine.cpp
+++ b/sdk/applications/actionstatemachine/ActionStateMachine.cpp
@@ -46,6 +46,7 @@ using namespace camitk;
 #include "ActionStateViewer.h"
 #include "ActionStateViewerExtension.h"
 #include "ActionTransition.h"
+#include "ActionStateWizard.h"
 
 // ---------------------- constructor ----------------------------
 ActionStateMachine::ActionStateMachine(int& argc, char** argv, QString inputFileName, QString outputDirectory) :
@@ -54,20 +55,20 @@ ActionStateMachine::ActionStateMachine(int& argc, char** argv, QString inputFile
     setProperty("Log to File", true);
     setProperty("Logger Level", InterfaceLogger::TRACE);
 
-    asmwiz = new ActionStateWizard();
-
-    // Read parameters or ask for scxml file name and output save directory
+    // Read parameters or ask for scxml filename and output directory
     QString filename;
     if (inputFileName.isEmpty() || outputDirectory.isEmpty()) {
-        // open dialog for parameters input
+        // open dialog wizard for parameters input
+        ActionStateWizard asmwiz(inputFileName, outputDirectory);
+
         // if OK is pressed we continue starting action state machine
         // otherwise we exit
-        if (asmwiz->exec()) {
-            filename = asmwiz->getSCXMLFilename();
-            saveDirectory = QDir(asmwiz->getLogDirectory());
-            asmwiz->done(QDialog::Accepted);
+        if (asmwiz.exec()) {
+            filename = asmwiz.getSCXMLFilename();
+            saveDirectory = QDir(asmwiz.getLogDirectory());
+            asmwiz.done(QDialog::Accepted);
         } else {
-            asmwiz->done(QDialog::Rejected);
+            asmwiz.done(QDialog::Rejected);
             throw AbortException("Operation aborted by user.");
         }
     } else {
@@ -80,8 +81,6 @@ ActionStateMachine::ActionStateMachine(int& argc, char** argv, QString inputFile
     ext->initResources();
     ext->init();
     registerAllViewers(ext);
-                        
-    statesMap = new QMap<QString, ActionState*>();
 
     // Atributes initialization
     mainWindow = NULL;
@@ -97,19 +96,17 @@ ActionStateMachine::ActionStateMachine(int& argc, char** argv, QString inputFile
     // NOTE on Windows ":" (colon) is reserved by the system for separating drive names, therefore hh:mm:ss cannot be used
     QString newDir = now.toString("yyyy-MM-dd") + "T" + now.toString("hh-mm-ss");
 
-    if (! saveDirectory.mkdir(newDir))  {
+    if (!saveDirectory.mkdir(newDir))  {
         saveDirectory = QFileDialog::getExistingDirectory(this->mainWindow, tr("Please select a directory where to save log and component files"));
         saveDirectory.mkdir(newDir);
     }
     saveDirectory.cd(newDir);
+    CAMITK_TRACE(tr("Logging in %1").arg(saveDirectory.absolutePath()));
 
     // parse XML file and store actions and transitions in states
     name = this->parseSCXMLTree();
     mainWindow->setWindowSubtitle(name);
 
-    // Prepare the output directory
-    QFile::copy(":/logXSL", saveDirectory.absolutePath() + "/log2html.xsl");
-
     // Starting the Machine !!
 
     //create the main timer
@@ -117,16 +114,390 @@ ActionStateMachine::ActionStateMachine(int& argc, char** argv, QString inputFile
     startTime->start();
 
     (*logStream) << "<?xml version='1.0' encoding='UTF-8' ?>" << endl;
-    (*logStream) << "<?xml-stylesheet type='text/xsl' href='log2html.xsl'?>" << endl << endl;
+    (*logStream) << "<?xml-stylesheet type='text/xsl' href='#stylesheet'?>" << endl;
+    (*logStream) << "<!DOCTYPE log [" << endl;
+    (*logStream) << "<!ATTLIST xsl:stylesheet" << endl;
+    (*logStream) << "id ID #REQUIRED>" << endl;
+    (*logStream) << "]>" << endl;
+    (*logStream) << "<log>" << endl;
+    // embed the XSL stylesheet directly in the XML
+
+    (*logStream) << "<!--" << endl;
+    (*logStream) << "/*****************************************************************************" << endl;
+    (*logStream) << " * $CAMITK_LICENCE_BEGIN$" << endl;
+    (*logStream) << " *" << endl;
+    (*logStream) << " * CamiTK - Computer Assisted Medical Intervention ToolKit" << endl;
+    (*logStream) << " * (c) 2001-2020 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)" << endl;
+    (*logStream) << " *" << endl;
+    (*logStream) << " * Visit http://camitk.imag.fr for more information" << endl;
+    (*logStream) << " *" << endl;
+    (*logStream) << " * This file is part of CamiTK." << endl;
+    (*logStream) << " *" << endl;
+    (*logStream) << " * CamiTK is free software: you can redistribute it and/or modify" << endl;
+    (*logStream) << " * it under the terms of the GNU Lesser General Public License version 3" << endl;
+    (*logStream) << " * only, as published by the Free Software Foundation." << endl;
+    (*logStream) << " *" << endl;
+    (*logStream) << " * CamiTK is distributed in the hope that it will be useful," << endl;
+    (*logStream) << " * but WITHOUT ANY WARRANTY; without even the implied warranty of" << endl;
+    (*logStream) << " * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the" << endl;
+    (*logStream) << " * GNU Lesser General Public License version 3 for more details." << endl;
+    (*logStream) << " *" << endl;
+    (*logStream) << " * You should have received a copy of the GNU Lesser General Public License" << endl;
+    (*logStream) << " * version 3 along with CamiTK.  If not, see <http://www.gnu.org/licenses/>." << endl;
+    (*logStream) << " *" << endl;
+    (*logStream) << " * $CAMITK_LICENCE_END$" << endl;
+    (*logStream) << " ****************************************************************************/" << endl;
+    (*logStream) << " " << endl;
+    (*logStream) << "  XSL stylesheet to display an ActionStateMachine application log in HTML." << endl;
+    (*logStream) << "  Insert this code in the XML for a client-side rendering." << endl;
+    (*logStream) << " " << endl;
+    (*logStream) << "-->" << endl;
+    (*logStream) << "" << endl;
+    (*logStream) << "<xsl:stylesheet id='stylesheet'" << endl;
+    (*logStream) << "				xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'" << endl;
+    (*logStream) << "                xmlns:log='http://ujf-grenoble.fr/camitk/logApplication'>" << endl;
+    (*logStream) << "    <xsl:output method='html'/>" << endl;
+    (*logStream) << "" << endl;
+    (*logStream) << "	<xsl:template match='xsl:stylesheet' />" << endl;
+    (*logStream) << "" << endl;
+    (*logStream) << "    <xsl:template match='/log'>" << endl;
+    (*logStream) << "        <html>" << endl;
+    (*logStream) << "            <head>" << endl;
+    (*logStream) << "                <title>Log of Application <xsl:value-of select='log:application/log:name'/></title>" << endl;
+    (*logStream) << "                <style type='text/css'>" << endl;
+    (*logStream) << "					body {" << endl;
+    (*logStream) << "						background: #FFFFFF;" << endl;
+    (*logStream) << "						font-family: arial, sans-serif;" << endl;
+    (*logStream) << "						font-size: 12pt" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					table {" << endl;
+    (*logStream) << "						border-width: 1px;" << endl;
+    (*logStream) << "					 	border-style: solid;" << endl;
+    (*logStream) << "					 	border-color: #eee;" << endl;
+    (*logStream) << "					 	width: 90%;" << endl;
+    (*logStream) << "					 	margin-left: 5%;" << endl;
+    (*logStream) << "					 	margin-right: 5%;" << endl;
+    (*logStream) << "						border: none;" << endl;
+    (*logStream) << "						border-top: 1px solid #EEEEEE;" << endl;
+    (*logStream) << "						font-family: arial, sans-serif;" << endl;
+    (*logStream) << "						border-collapse: collapse" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					td," << endl;
+    (*logStream) << "					th {" << endl;
+    (*logStream) << "						border: none; /* 0px solid #EEEEEE;*/" << endl;
+    (*logStream) << "						border-top: none;" << endl;
+    (*logStream) << "						text-align: left;" << endl;
+    (*logStream) << "						padding: 8px;" << endl;
+    (*logStream) << "						color: #363D41;" << endl;
+    (*logStream) << "						font-size: 14px" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					tr {" << endl;
+    (*logStream) << "						background-color: #fff;" << endl;
+    (*logStream) << "						border-width: 1px;" << endl;
+    (*logStream) << "						border-style: solid;" << endl;
+    (*logStream) << "						border-color: #ccc;" << endl;
+    (*logStream) << "						cursor: pointer;" << endl;
+    (*logStream) << "						display: grid;" << endl;
+    (*logStream) << "						grid-template-columns: repeat(3, 1fr);" << endl;
+    (*logStream) << "						justify-content: flex-start" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					tr: first-child: hover {" << endl;
+    (*logStream) << "						cursor: default;" << endl;
+    (*logStream) << "						background-color: #fff" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					tr: hover {" << endl;
+    (*logStream) << "						background-color: #EEF4FD" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					.expanded-row-content {" << endl;
+    (*logStream) << "						border-top: none;" << endl;
+    (*logStream) << "						display: grid;" << endl;
+    (*logStream) << "						grid-column: 1/-1;" << endl;
+    (*logStream) << "						justify-content: flex-start;" << endl;
+    (*logStream) << "						color: #AEB1B3;" << endl;
+    (*logStream) << "						font-size: 13px;" << endl;
+    (*logStream) << "						background-color: #fff" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					.hide-row {" << endl;
+    (*logStream) << "						display: none" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					.mainFrame {" << endl;
+    (*logStream) << "						padding: 0px;" << endl;
+    (*logStream) << "					    border: 3px solid gray;" << endl;
+    (*logStream) << "					    background: #FFFFFF;" << endl;
+    (*logStream) << "					    -moz-border-radius: 20px;" << endl;
+    (*logStream) << "					    -webkit-border-radius: 20px;" << endl;
+    (*logStream) << "					    -khtml-border-radius: 20px;" << endl;
+    (*logStream) << "  					 	border-radius: 20px;" << endl;
+    (*logStream) << "					    margin-top: 50px;" << endl;
+    (*logStream) << "					    margin-bottom: 50px;" << endl;
+    (*logStream) << "					    margin-right: 50px;" << endl;
+    (*logStream) << "						margin-left: 50px" << endl;
+    (*logStream) << "						" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					.stateFrame {" << endl;
+    (*logStream) << "						 margin-top: 10px;" << endl;
+    (*logStream) << "					 	margin-bottom: 10px;" << endl;
+    (*logStream) << "					 	margin-right: 10px;" << endl;
+    (*logStream) << "						margin-left: 10px;" << endl;
+    (*logStream) << "						padding: 30px;" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					 	/* make rounded borders */" << endl;
+    (*logStream) << "					 	border: 3px solid #ccc;" << endl;
+    (*logStream) << "					 	-moz-border-radius: 10px;" << endl;
+    (*logStream) << "					 	-webkit-border-radius: 10px;" << endl;
+    (*logStream) << "					 	-khtml-border-radius: 10px;" << endl;
+    (*logStream) << "					 	border-radius: 10px;" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					 	/* make a nice linear graidant */" << endl;
+    (*logStream) << "					 	background: #eef; /* Old browsers */" << endl;
+    (*logStream) << "					 	background: -moz-linear-gradient(top, #eec; 0%, #ccc 100%); /* FF3.6+ */" << endl;
+    (*logStream) << "					 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eee), color-stop(100%,#ccc)); /* Chrome,Safari4+ */" << endl;
+    (*logStream) << "					 	background: -webkit-linear-gradient(top, #eee 0%,#ccc 100%); /* Chrome10+,Safari5.1+ */" << endl;
+    (*logStream) << "					 	background: -o-linear-gradient(top, #eee 0%,#ccc 100%); /* Opera 11.10+ */" << endl;
+    (*logStream) << "					 	background: -ms-linear-gradient(top, #eee 0%,#ccc 100%); /* IE10+ */" << endl;
+    (*logStream) << "					 	background: linear-gradient(to bottom, #eee 0%,#ccc 100%); /* W3C */" << endl;
+    (*logStream) << "					 	filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='#eee', endColorstr='#ccc',GradientType=0 ); /* IE6-9 */					" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					h1 {" << endl;
+    (*logStream) << "					 	font-weight: 700;" << endl;
+    (*logStream) << "					 	font-size: 25px;" << endl;
+    (*logStream) << "					 	text-align: center" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					h2 {" << endl;
+    (*logStream) << "					 	font-size: 20px;" << endl;
+    (*logStream) << "					 	text-align: center;" << endl;
+    (*logStream) << "					 	font-style: italic" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					h3 {" << endl;
+    (*logStream) << "					 	font-size: 20px;" << endl;
+    (*logStream) << "					 	text-align: center" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					.enhanced {" << endl;
+    (*logStream) << "					 	font-size: 20px;" << endl;
+    (*logStream) << "					 	font-style: italic;" << endl;
+    (*logStream) << "					 	font-weight: 700" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					.italic {" << endl;
+    (*logStream) << "					 	font-style: italic" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					table.simple {" << endl;
+    (*logStream) << "					 	border-width: 0px" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					td.simple {" << endl;
+    (*logStream) << "					 	border-width: 0px" << endl;
+    (*logStream) << "					}					" << endl;
+    (*logStream) << "					.stateColor {" << endl;
+    (*logStream) << "						color: #00008B;" << endl;
+    (*logStream) << "						font-size: 12pt;" << endl;
+    (*logStream) << "						margin-bottom: 0.5em;" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					.ioColor {" << endl;
+    (*logStream) << "						color: #00008B;" << endl;
+    (*logStream) << "						font-size: 12pt;" << endl;
+    (*logStream) << "					}					" << endl;
+    (*logStream) << "					.actionColor {" << endl;
+    (*logStream) << "						color: #8B0000;" << endl;
+    (*logStream) << "						font-size: 12pt;" << endl;
+    (*logStream) << "						margin-bottom: 0.5em;" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "					" << endl;
+    (*logStream) << "					kbd {" << endl;
+    (*logStream) << "						border-radius: 5px;" << endl;
+    (*logStream) << "						moz-border-radius: 5px;" << endl;
+    (*logStream) << "					 	-webkit-border-radius: 5px;" << endl;
+    (*logStream) << "					 	-khtml-border-radius: 5px;" << endl;
+    (*logStream) << "						color: white;" << endl;
+    (*logStream) << "						padding: 2px;" << endl;
+    (*logStream) << "						border: 2px solid white;" << endl;
+    (*logStream) << "						background-color: #333;" << endl;
+    (*logStream) << "						font-size: 80%;" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "			</style>" << endl;
+    (*logStream) << "            </head>" << endl;
+    (*logStream) << "            <body>" << endl;
+    (*logStream) << "                <div class='mainFrame'>                    " << endl;
+    (*logStream) << "                    <div class='stateFrame'>" << endl;
+    (*logStream) << "                        <h1><xsl:value-of select='log:application/log:name'/></h1>" << endl;
+    (*logStream) << "                        <h2>Log file</h2>" << endl;
+    (*logStream) << "                        <h3>Date: <xsl:value-of select='log:application/log:startDate'/></h3>" << endl;
+    (*logStream) << "                        <h3>Started: <xsl:value-of select='log:application/log:startTime'/> - Finished: <xsl:value-of select='log:application/log:endTime'/> </h3>" << endl;
+    (*logStream) << "                        <h2>Duration: <xsl:call-template name='formatTime'>" << endl;
+    (*logStream) << "                                      	<xsl:with-param name='timeElapsed' select='log:application/log:timeElapsed'/>" << endl;
+    (*logStream) << "                                      </xsl:call-template>" << endl;
+    (*logStream) << "                        </h2>" << endl;
+    (*logStream) << "						<h3>Input xml file name: <tt><xsl:value-of select='log:application/log:inputXmlFile'/></tt></h3>" << endl;
+    (*logStream) << "						<p></p>" << endl;
+    (*logStream) << "                    </div>" << endl;
+    (*logStream) << "" << endl;
+    (*logStream) << "                    <div class='stateFrame'>" << endl;
+    (*logStream) << "                        <xsl:variable name='timeStateTotal'  select='sum(log:application/log:state/log:timeElapsed)'/>" << endl;
+    (*logStream) << "                        <xsl:variable name='timeActionTotal' select='sum(log:application/log:transition/log:timeElapsed)'/>" << endl;
+    (*logStream) << "" << endl;
+    (*logStream) << "                        <h3>Total time spend within states: " << endl;
+    (*logStream) << "                            <span class='stateColor'>" << endl;
+    (*logStream) << "                                <xsl:call-template name='formatTime'>" << endl;
+    (*logStream) << "                                    <xsl:with-param name='timeElapsed' select='sum(log:application/log:state/log:timeElapsed)'/>" << endl;
+    (*logStream) << "                                </xsl:call-template>" << endl;
+    (*logStream) << "                            (<xsl:value-of select='sum(log:application/log:state/log:timeElapsed)'/> ms)</span>" << endl;
+    (*logStream) << "                        </h3>" << endl;
+    (*logStream) << "                       " << endl;
+    (*logStream) << "                        <h3>Total time spend on action transitions: " << endl;
+    (*logStream) << "                            <span class='actionColor'>" << endl;
+    (*logStream) << "                                <xsl:call-template name='formatTime'>" << endl;
+    (*logStream) << "                                    <xsl:with-param name='timeElapsed' select='sum(log:application/log:transition/log:timeElapsed)'/>" << endl;
+    (*logStream) << "                                </xsl:call-template>" << endl;
+    (*logStream) << "                                (<xsl:value-of select='sum(log:application/log:transition/log:timeElapsed)'/> ms)</span>" << endl;
+    (*logStream) << "						</h3>" << endl;
+    (*logStream) << "						<table>" << endl;
+    (*logStream) << "							<tr>" << endl;
+    (*logStream) << "								<th><span class='stateColor'><div class='enhanced'>State</div></span> (click on a state to show its execution details)</th>" << endl;
+    (*logStream) << "   						    </tr>" << endl;
+    (*logStream) << "							<xsl:apply-templates select='log:application/log:state'/>" << endl;
+    (*logStream) << "						</table>" << endl;
+    (*logStream) << "                    </div>" << endl;
+    (*logStream) << "				</div>" << endl;
+    (*logStream) << "				<script>" << endl;
+    (*logStream) << "					const toggleRow = (element) => {" << endl;
+    (*logStream) << "					  element.getElementsByClassName('expanded-row-content')[0].classList.toggle('hide-row');" << endl;
+    (*logStream) << "					}" << endl;
+    (*logStream) << "				  </script>" << endl;
+    (*logStream) << "            </body>" << endl;
+    (*logStream) << "        </html>" << endl;
+    (*logStream) << "    </xsl:template>" << endl;
+    (*logStream) << "" << endl;
+    (*logStream) << "    <xsl:template match='log:state'>" << endl;
+    (*logStream) << "        <xsl:variable name='count'>" << endl;
+    (*logStream) << "            <xsl:number/>" << endl;
+    (*logStream) << "        </xsl:variable>" << endl;
+    (*logStream) << "		<tr onClick='toggleRow(this)'>" << endl;
+    (*logStream) << "            <td>" << endl;
+    (*logStream) << "                <span class='stateColor'><div class='enhanced'>" << endl;
+    (*logStream) << "                <xsl:value-of select='$count'/>. <xsl:value-of select='log:name'/>" << endl;
+    (*logStream) << "                </div></span>" << endl;
+    (*logStream) << "			</td>" << endl;
+    (*logStream) << "			<td class='expanded-row-content hide-row'>" << endl;
+    (*logStream) << "				<xsl:if test='count(log:actionName)>0'>" << endl;
+    (*logStream) << "					<span class='actionColor'>CamiTK action's name: <kbd><xsl:value-of select='log:actionName'/></kbd></span>" << endl;
+    (*logStream) << "				</xsl:if>" << endl;
+    (*logStream) << "				<span class='stateColor'>State duration: " << endl;
+    (*logStream) << "					<xsl:call-template name='formatTime'>" << endl;
+    (*logStream) << "						<xsl:with-param name='timeElapsed' select='log:timeElapsed'/>" << endl;
+    (*logStream) << "					</xsl:call-template>" << endl;
+    (*logStream) << "				</span>" << endl;
+    (*logStream) << "				<xsl:apply-templates select='following-sibling::log:transition[1]'/>" << endl;
+    (*logStream) << "			</td>" << endl;
+    (*logStream) << "		 </tr>" << endl;
+    (*logStream) << "	</xsl:template>" << endl;
+    (*logStream) << "	" << endl;
+    (*logStream) << "    <xsl:template match='log:transition'>" << endl;
+    (*logStream) << "        <xsl:apply-templates select='log:applyAction | log:closing'/>" << endl;
+    (*logStream) << "	</xsl:template>" << endl;
+    (*logStream) << "	" << endl;
+    (*logStream) << "    <xsl:template match='log:applyAction'>" << endl;
+    (*logStream) << "        <xsl:variable name='count'>" << endl;
+    (*logStream) << "            <xsl:number/>" << endl;
+    (*logStream) << "		</xsl:variable>" << endl;
+    (*logStream) << "		<!-- the preceding <state> element (which corresponds to the state of the current transition) -->" << endl;
+    (*logStream) << "		<xsl:variable name='state' select='../preceding-sibling::log:state[1]'/>" << endl;
+    (*logStream) << "" << endl;
+    (*logStream) << "		<span class='stateColor'>Transition duration: " << endl;
+    (*logStream) << "			<xsl:call-template name='formatTime'>" << endl;
+    (*logStream) << "				<xsl:with-param name='timeElapsed' select='../log:timeElapsed'/>" << endl;
+    (*logStream) << "			</xsl:call-template>" << endl;
+    (*logStream) << "		</span>" << endl;
+    (*logStream) << "		<span class='stateColor'>Action <tt></tt> applied with status: <xsl:value-of select='log:status'/></span>" << endl;
+    (*logStream) << "" << endl;
+    (*logStream) << "		<!-- for some action, the parameters and inputs are logged inside the <applyAction> element" << endl;
+    (*logStream) << "				but for most of the action they are logged inside the <state> element." << endl;
+    (*logStream) << "				The XPaths expression below are selecting the <parameters> and <inputs> elements" << endl;
+    (*logStream) << "				- inside the current <applyAction> element" << endl;
+    (*logStream) << "				- as well as inside the preceding <state> element (which corresponds to the state current of the current transition)" << endl;
+    (*logStream) << "		-->" << endl;
+    (*logStream) << "		<xsl:if test='count(log:parameters|$state/log:parameters)>0'>" << endl;
+    (*logStream) << "			<span class='ioColor'>Parameters:</span>				" << endl;
+    (*logStream) << "			<xsl:apply-templates select='log:parameters|$state/log:parameters'/>" << endl;
+    (*logStream) << "		</xsl:if>" << endl;
+    (*logStream) << "		<xsl:if test='count(log:inputs|$state/log:inputs)>0'>" << endl;
+    (*logStream) << "			<span class='ioColor'>Input:</span>" << endl;
+    (*logStream) << "			<xsl:apply-templates select='log:inputs|$state/log:inputs'/>" << endl;
+    (*logStream) << "		</xsl:if>" << endl;
+    (*logStream) << "		<xsl:if test='count(log:outputs)>0'>" << endl;
+    (*logStream) << "			<span class='ioColor'>Output:</span>" << endl;
+    (*logStream) << "			<xsl:apply-templates select='log:outputs'/>				" << endl;
+    (*logStream) << "		</xsl:if>		" << endl;
+    (*logStream) << "" << endl;
+    (*logStream) << "    </xsl:template>" << endl;
+    (*logStream) << "    " << endl;
+    (*logStream) << "    <xsl:template match='log:closing'>" << endl;
+    (*logStream) << "		<span class='stateColor'>Closing:</span>" << endl;
+    (*logStream) << "		<xsl:apply-templates select='log:component'/>" << endl;
+    (*logStream) << "        " << endl;
+    (*logStream) << "    </xsl:template>" << endl;
+    (*logStream) << "    " << endl;
+    (*logStream) << "    <xsl:template match='log:parameters'>" << endl;
+    (*logStream) << "        <ul style='margin:0px;'>" << endl;
+    (*logStream) << "            <xsl:apply-templates select='log:parameter'/>" << endl;
+    (*logStream) << "		</ul>" << endl;
+    (*logStream) << "    </xsl:template>" << endl;
+    (*logStream) << "" << endl;
+    (*logStream) << "    <xsl:template match='log:parameter'>" << endl;
+    (*logStream) << "        <li><span class='stateColor'><xsl:value-of select='@name'/>: <kbd><xsl:value-of select='@value'/></kbd></span></li>" << endl;
+    (*logStream) << "    </xsl:template>" << endl;
+    (*logStream) << "" << endl;
+    (*logStream) << "    <xsl:template match='log:outputs'>" << endl;
+    (*logStream) << "        <ul style='margin:0px;'>" << endl;
+    (*logStream) << "            <xsl:apply-templates select='log:component'/>" << endl;
+    (*logStream) << "        </ul>" << endl;
+    (*logStream) << "    </xsl:template>" << endl;
+    (*logStream) << "" << endl;
+    (*logStream) << "    <xsl:template match='log:inputs'>" << endl;
+    (*logStream) << "        <ul style='margin:0px;'>" << endl;
+    (*logStream) << "            <xsl:apply-templates select='log:component'/>" << endl;
+    (*logStream) << "		</ul>" << endl;
+    (*logStream) << "    </xsl:template>" << endl;
+    (*logStream) << "" << endl;
+    (*logStream) << "    <xsl:template match='log:component'>" << endl;
+    (*logStream) << "        <li><span class='stateColor'><xsl:value-of select='@type'/>: <kbd><xsl:value-of select='@name'/></kbd></span></li>" << endl;
+    (*logStream) << "    </xsl:template>" << endl;
+    (*logStream) << "    " << endl;
+    (*logStream) << "    <xsl:template name='formatTime'>" << endl;
+    (*logStream) << "	    <xsl:param name='timeElapsed' select='/log/log:application/log:timeElapsed'/>" << endl;
+    (*logStream) << "        <!--" << endl;
+    (*logStream) << "            int milisec = (startTime->elapsed());" << endl;
+    (*logStream) << "            int mili    = milisec % 1000;" << endl;
+    (*logStream) << "            int seconds = ((milisec % (3600000)) % (60000)) / 1000;" << endl;
+    (*logStream) << "            int minutes = (milisec % (3600000)) / (60000);" << endl;
+    (*logStream) << "            int hours   = milisec / (3600000);" << endl;
+    (*logStream) << "        -->" << endl;
+    (*logStream) << "        <xsl:variable name='hours'    select='floor($timeElapsed div 3600000)'/>" << endl;
+    (*logStream) << "        <xsl:variable name='minutes'  select='floor(($timeElapsed - $hours * 3600000) div 60000)'/>" << endl;
+    (*logStream) << "        <xsl:variable name='secondes' select='floor(($timeElapsed - $hours * 3600000 - $minutes * 60000) div 1000)'/>" << endl;
+    (*logStream) << "        <xsl:variable name='msec'     select='floor($timeElapsed - $hours * 3600000 - $minutes * 60000 -$secondes * 1000)'/>        <xsl:if test='$hours > 0'><xsl:value-of select='$hours'/> h </xsl:if>" << endl;
+    (*logStream) << "        <xsl:if test='$minutes > 0'><xsl:value-of select='$minutes'/> min </xsl:if>" << endl;
+    (*logStream) << "        <xsl:if test='$secondes > 0'><xsl:value-of select='$secondes'/> s </xsl:if>" << endl;
+    (*logStream) << "        <xsl:if test='$msec > 0'><xsl:value-of select='$msec'/> ms</xsl:if>" << endl;
+    (*logStream) << "        <xsl:if test='$timeElapsed = 0'>&lt;1 ms</xsl:if>" << endl;
+    (*logStream) << "    </xsl:template>" << endl;
+    (*logStream) << "</xsl:stylesheet>    " << endl;
     (*logStream) << "<application xmlns='http://ujf-grenoble.fr/camitk/logApplication'>" << endl;
-    (*logStream) << "\t<name>" << name << "</name>" << endl;
+    (*logStream) << "\t<name>" << getName() << "</name>" << endl;
     (*logStream) << "\t<inputXmlFile>" << filename << "</inputXmlFile>" << endl;
     (*logStream) << "\t<startDate>" << now.toString("yyyy-MM-dd") << "</startDate>" << endl;
     (*logStream) << "\t<startTime>" << startTime->toString("hh:mm:ss:zzz") << "</startTime>" << endl;
 
     machine.start();
-
-
 }
 
 // ---------------------- autoNext ----------------------------
@@ -140,23 +511,43 @@ void ActionStateMachine::autoNext() {
     // loop until no more state is available
     while (currentState != nullptr && currentState->transitions().size() > 0) {
         // look for the "Next" or "Quit" transition
+        // (if there is a "Next" and a "Quit", "Next" is prioritized)
         auto it = currentState->transitions().begin();
         bool foundNextState = false;
-        while (it != currentState->transitions().end() && !foundNextState) { // && nextState==nullptr) {
+        while (it != currentState->transitions().end() && !foundNextState) { 
             // all transition in this state machine are ActionTransition instances...
             ActionTransition* currentActionTransition = qobject_cast<ActionTransition*>(*it);
 
-            //... in which we can look for the "Next" or "Quit" transition
-            if (currentActionTransition->isNamed("Next") || currentActionTransition->isNamed("Quit")) {
+            //... in which we can look for the "Next" transition first
+            if (currentActionTransition->isNamed("Next")) {
                 // activate the transition (simulate a click on the button)
                 currentActionTransition->autoNext();  // activating the "Quit" transition enter the final state, which make the state machine to emit the finished() signal
                 foundNextState = true;
             }
+        
             ++it;
         }
+        // if the next state is not found, look for the "Quit" state
+        if (!foundNextState) {
+            it = currentState->transitions().begin();
+            while (it != currentState->transitions().end() && !foundNextState) { 
+                // all transition in this state machine are ActionTransition instances...
+                ActionTransition* currentActionTransition = qobject_cast<ActionTransition*>(*it);
+
+                //... in which we can look for the "Quit" transition
+                if (currentActionTransition->isNamed("Quit")) {
+                    // activate the transition (simulate a click on the button)
+                    currentActionTransition->autoNext();  // activating the "Quit" transition enter the final state, which make the state machine to emit the finished() signal
+                    foundNextState = true;
+                }
+            
+                ++it;
+            }
+        }
         // get the new current active state
         currentState = dynamic_cast<ActionState*>(machine.configuration().toList().first());
     }
+
     while (currentState != nullptr);
 
 }
@@ -230,6 +621,7 @@ void ActionStateMachine::checkSCXMLFile(QString filename) {
 
 // ---------------------- parseSCXMLTree ----------------------------
 QString ActionStateMachine::parseSCXMLTree() {
+
     // Get the name of the application
     QString applicationName = "";
     QDomElement docElem = scxmlDoc.documentElement();
@@ -252,7 +644,7 @@ QString ActionStateMachine::parseSCXMLTree() {
 
     // Set the initial state (specified in the scxml element with initial attribute).
     QString initialStateName = scxmlDoc.documentElement().attribute("initial");
-    ActionState* initialState = statesMap->find(initialStateName).value();
+    ActionState* initialState = statesMap.find(initialStateName).value();
     machine.setInitialState(initialState);
     dynamic_cast<ActionStateViewer*>(Application::getViewer("Action State Viewer"))->setState(initialState);
 
@@ -262,10 +654,6 @@ QString ActionStateMachine::parseSCXMLTree() {
     // and connect the about to quit with some final cleanup method (recommended instead using destructor to cleanup)
     QObject::connect(this, SIGNAL(aboutToQuit()), this, SLOT(finished()));
 
-    // Ok, Actions and Wizard are created. We do not need the file any more.
-    // Clean up:
-    delete statesMap;
-
     return applicationName;
 }
 
@@ -274,8 +662,9 @@ void ActionStateMachine::finished() {
     QTime endTime = QTime::currentTime();
 
     (*logStream) << "\t<endTime>" << endTime.toString("hh:mm:ss:zzz") << "</endTime>" << endl;
-    (*logStream) << "\t<timeEnlapsed unit='ms'>" << (startTime->elapsed()) << "</timeEnlapsed>" << endl;
+    (*logStream) << "\t<timeElapsed unit='ms'>" << (startTime->elapsed()) << "</timeElapsed>" << endl;
     (*logStream) << "</application>" << endl;
+    (*logStream) << "</log>" << endl;
     logFile->close();
 }
 
@@ -295,20 +684,23 @@ void ActionStateMachine::createAllActionStates(QDomNodeList nodeList) {
             if (elementName == QString("state")) {
                 QString stateId = element.attribute("id");
                 QString stateDescription = element.elementsByTagName("camitk:description").item(0).toElement().text();
-                ActionState* state = new ActionState(&machine, stateId, stateDescription, logStream);
-                if (element.elementsByTagName("camitk:action").size()  > 0) {
+                ActionState* state = nullptr;
+                if (element.elementsByTagName("camitk:action").size() > 0) {
                     QDomElement actionElement = element.elementsByTagName("camitk:action").item(0).toElement();
                     // Find the name of the action
                     QString camiTKActionName = actionElement.elementsByTagName("camitk:name").item(0).toElement().text();
                     if (camiTKActionName == "Save") {
-                        delete (state);
                         state = new SaveActionState(&machine, stateId, stateDescription, saveDirectory.absolutePath(), logStream);
                         setCamiTKSaveAction((SaveActionState*) state, actionElement);
                     }
                     else {
+                        state = new ActionState(&machine, stateId, stateDescription, logStream);
                         setCamiTKAction(state, actionElement);
                     }
                 }
+                else {
+                        state = new ActionState(&machine, stateId, stateDescription, logStream);
+                }
                 QDomNodeList alternativeDescriptions = element.elementsByTagName("camitk:altDescription");
                 for (int i = 0; i < alternativeDescriptions.size(); i++) {
                     QDomElement altDescElmt = alternativeDescriptions.item(i).toElement();
@@ -319,7 +711,7 @@ void ActionStateMachine::createAllActionStates(QDomNodeList nodeList) {
                     state->setAlternativeDesc(altDescText, statusList);
 
                 }
-                statesMap->insert(stateId, state);
+                statesMap.insert(stateId, state);
             }
         }
     }
@@ -331,8 +723,8 @@ void ActionStateMachine::createAllActionStates(QDomNodeList nodeList) {
     // 1. build the map
     QMap <ActionState*, QString> inputNames;
     QMap <ActionState*, QString> outputNames;
-    QMap <QString, ActionState* >::const_iterator it = statesMap->constBegin();
-    while (it != statesMap->constEnd()) {
+    QMap <QString, ActionState* >::const_iterator it = statesMap.constBegin();
+    while (it != statesMap.constEnd()) {
         foreach (QString inputCompName, it.value()->getInputComponents().keys()) {
             if (inputNames.values().contains(inputCompName)) {
                 CAMITK_WARNING(tr("Warning: same input \"%1\" for more than one state. It might be wrong.\n").arg(inputCompName))
@@ -376,7 +768,7 @@ void ActionStateMachine::createTransitions(QDomNodeList nodeList)  {
         // Find its name (id attribute)...
         QString stateId = element.attribute("id");
         // ... and get the corresponding created state in the map:
-        ActionState* state = (statesMap->find(stateId)).value();
+        ActionState* state = (statesMap.find(stateId)).value();
         // Check if this state is final
         bool isFinal = (element.attribute("final", "false").toLower() == QString("true"));
 
@@ -397,8 +789,8 @@ void ActionStateMachine::createTransitions(QDomNodeList nodeList)  {
                 QVector<Action::ApplyStatus> disableConditions = stringToStatus(disableConds);
 
                 // Find the corresponding target state
-                QMap <QString, ActionState* >::iterator it = statesMap->find(targetName);
-                if (it == statesMap->end()) {
+                QMap <QString, ActionState* >::iterator it = statesMap.find(targetName);
+                if (it == statesMap.end()) {
                     QString msg = tr(R"(XML Parsing: %1 in state "%2": cannot find target "%3" for event "%4")")
                                   .arg(getDomNodeLocation(transitionsList.item(transNb)),
                                        state->getName(),
diff --git a/sdk/applications/actionstatemachine/ActionStateMachine.h b/sdk/applications/actionstatemachine/ActionStateMachine.h
index 79f40cf902722df164fc13ae911db0a1f586ac12..652af07ebbd82f145f4e0d1ac8d916c1eab57db6 100644
--- a/sdk/applications/actionstatemachine/ActionStateMachine.h
+++ b/sdk/applications/actionstatemachine/ActionStateMachine.h
@@ -46,7 +46,6 @@
 // -- CamiTK Local stuff
 #include "ActionState.h"
 #include "SaveActionState.h"
-#include "ActionStateWizard.h"
 
 /**
  * @ingroup group_sdk_application_asm
@@ -109,7 +108,7 @@ protected:
     QDomDocument scxmlDoc;
 
     /// Map of action state to build transitions
-    QMap<QString, ActionState*>* statesMap;
+    QMap<QString, ActionState*> statesMap;
 
     /// Final State
     QFinalState* finalState;
@@ -149,11 +148,6 @@ private:
 
     /// build a specific error message containing the line and column if available
     QString getDomNodeLocation(QDomNode);
-
-    /// <summary>
-    ///  Wizard to ask wich file and directory to use
-    /// </summary>
-    ActionStateWizard* asmwiz;
 };
 
 #endif // ACTIONSTATEMACHINE_H
diff --git a/sdk/applications/actionstatemachine/ActionStateWizard.cpp b/sdk/applications/actionstatemachine/ActionStateWizard.cpp
index 56c94a683ed78ebf9ff93615152f92dfba3a973d..8b90aeebee12c3c297545dd29b7d3e7385a59902 100644
--- a/sdk/applications/actionstatemachine/ActionStateWizard.cpp
+++ b/sdk/applications/actionstatemachine/ActionStateWizard.cpp
@@ -28,56 +28,70 @@
 // -- CamiTK Application Local stuff
 #include "ActionStateWizard.h"
 
-ActionStateWizard::ActionStateWizard() {
-	uiasmwiz = new Ui::ActionStateWizard();
-	uiasmwiz->setupUi(this);
+// ---------------------- constructor ----------------------------
+ActionStateWizard::ActionStateWizard(QString inputFileName, QString outputDir) {
+	// init GUI
+	ui = new Ui::ActionStateWizard();
+	ui->setupUi(this);
+	ui->buttonBox->button(QDialogButtonBox::Ok)->setText("Start CamiTK Action State Machine");
 
-	connect(uiasmwiz->browseSCXML, SIGNAL(clicked()), this, SLOT(findSCXMLFileName()));
-	connect(uiasmwiz->browseLogDirectory, SIGNAL(clicked()), this, SLOT(findLogDirectory()));
+	connect(ui->browseSCXML, SIGNAL(clicked()), this, SLOT(selectSCXMLFilename()));
+	connect(ui->browseLogDir, SIGNAL(clicked()), this, SLOT(selectLogDirectory()));
+
+	SCXMLFileName = inputFileName;
+	logDirectory = outputDir;
 
 	initLogDirLabel();
 	initSCXMLLabel();
 }
 
-// Getter and setter for chosen file and directory
+// ---------------------- getSCXMLFilename ----------------------------
 QString ActionStateWizard::getSCXMLFilename() {
 	return SCXMLFileName;
 }
 
+// ---------------------- getLogDirectory ----------------------------
 QString ActionStateWizard::getLogDirectory() {
 	return logDirectory;
 }
 
-void ActionStateWizard::setSCXMLFileName(QString inputFileName) {
-	SCXMLFileName = inputFileName;
-}
-
-void ActionStateWizard::setLogDirectory(QString outputDir) {
-	logDirectory = outputDir;
-}
-
-void ActionStateWizard::findLogDirectory() {
+// ---------------------- selectLogDirectory ----------------------
+void ActionStateWizard::selectLogDirectory() {
 	logDirectory = QFileDialog::getExistingDirectory(this, tr("Please select a directory where to save log and component files"));
 	initLogDirLabel();
 }
 
-void ActionStateWizard::findSCXMLFileName() {
+// ---------------------- selectSCXMLFilename ----------------------
+void ActionStateWizard::selectSCXMLFilename() {
 	SCXMLFileName = QFileDialog::getOpenFileName(this, tr("Please select an xml file"));
 	initSCXMLLabel();
 }
 
+// ---------------------- initSCXMLLabel ----------------------
 void ActionStateWizard::initSCXMLLabel() {
     if (SCXMLFileName.isEmpty()) {
-        uiasmwiz->SCXMLLabel->setText("No xml file !");
+        ui->SCXMLLabel->setText("<font color=\"red\">No SCXML document: please select an XML file...</font>");
+		ui->browseSCXMLLabel->setText("<font color=\"red\">Select SCXML document</font>");
     } else {
-        uiasmwiz->SCXMLLabel->setText(SCXMLFileName);
+        ui->SCXMLLabel->setText(SCXMLFileName);
+		ui->browseSCXMLLabel->setText("Modify SCXML document");
     }
+	updateStartButtonState();
 }
 
+// ---------------------- initLogDirLabel ----------------------
 void ActionStateWizard::initLogDirLabel() {
     if (logDirectory.isEmpty()) {
-        uiasmwiz->LogDirLabel->setText("No output directory !");
+        ui->LogDirLabel->setText("<font color=\"red\">No output directory: please select a directory</font>");
+        ui->browseLogDirLabel->setText("<font color=\"red\">Secect output directory</font>");
     } else {
-        uiasmwiz->LogDirLabel->setText(logDirectory);
+        ui->LogDirLabel->setText(logDirectory);
+		ui->browseLogDirLabel->setText("Modify output directory");
     }
+	updateStartButtonState();
+}
+
+// ---------------------- updateStartButtonState ----------------------
+void ActionStateWizard::updateStartButtonState() {
+	ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!SCXMLFileName.isEmpty() && !logDirectory.isEmpty());
 }
\ No newline at end of file
diff --git a/sdk/applications/actionstatemachine/ActionStateWizard.h b/sdk/applications/actionstatemachine/ActionStateWizard.h
index e2102d039c11b18b3987d33bd974d477e7013bca..d357e6a39a0131135b9302f0a785456740db92b7 100644
--- a/sdk/applications/actionstatemachine/ActionStateWizard.h
+++ b/sdk/applications/actionstatemachine/ActionStateWizard.h
@@ -28,35 +28,50 @@
 
 #include "ui_ActionStateWizard.h"
 
+/**
+ * @ingroup group_sdk_application_asm
+ *
+ * @brief
+ * This dialog is shown only if at least one of the two required input parameters (SCXML
+ * and output directory) is missing when the application is started.
+ *
+ */
 class ActionStateWizard : public QDialog {
     Q_OBJECT
 public:
-    ActionStateWizard();
+    /// Constructor (initialize the application parameters)
+    ActionStateWizard(QString inputFileName, QString outputDir);
 
-    // Return the filename of scxml file to use as input file
+    /// Return the current filename of scxml file to use as input file
     QString getSCXMLFilename();
 
-    // Return the directory name to use as output log directory
+    /// Return the current directory name to use as output log directory
     QString getLogDirectory();
 
-    void setSCXMLFileName(QString inputFileName);
-
-    void setLogDirectory(QString outputDir);
-
 private slots:
-    void findLogDirectory();
+    /// called when the user click on "Browse" to select an output directory
+    void selectLogDirectory();
 
-    void findSCXMLFileName();
+    /// called when the user click on "Browse" to select an SCXML input file
+    void selectSCXMLFilename();
 
 private:
-    Ui::ActionStateWizard* uiasmwiz;
+    /// the Dialog GUI
+    Ui::ActionStateWizard* ui;
 
+    /// the current value of the SCXML input file
     QString SCXMLFileName;
 
+    /// the current value of the output directory
     QString logDirectory;
 
+    /// initialize the GUI to display the current value of SCXML input file
+    void initSCXMLLabel();
+
+    /// initialize the GUI to display the current value of output directory
     void initLogDirLabel();
 
-    void initSCXMLLabel();
+    /// enable the Start button state only if both parameters are set
+    void updateStartButtonState();
 };
 #endif // ACTIONSTATEWIZARD_H
\ No newline at end of file
diff --git a/sdk/applications/actionstatemachine/ActionStateWizard.ui b/sdk/applications/actionstatemachine/ActionStateWizard.ui
index e975fd2a8d067d95c93184f95aeb6ac2f495e68b..be211556e2c707f8a2028f8a9ddf36c7f1e4de5c 100644
--- a/sdk/applications/actionstatemachine/ActionStateWizard.ui
+++ b/sdk/applications/actionstatemachine/ActionStateWizard.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>471</width>
-    <height>146</height>
+    <width>482</width>
+    <height>388</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,87 +19,101 @@
      <item>
       <widget class="QLabel" name="InfoLabel">
        <property name="text">
-        <string>CamiTK Action State Machine needs two parameters to run.</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;CamiTK Action State Machine requires two parameters to run&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;An SCXML to describe the state machine&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;An output directory to write the log&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::RichText</enum>
        </property>
       </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QLabel" name="scxmlFileLbl">
-         <property name="text">
-          <string>Choose a SCXML file :</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="browseSCXML">
-         <property name="text">
-          <string>Browse</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      <widget class="QGroupBox" name="groupBox">
+       <property name="title">
+        <string>SCXML</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="QLabel" name="SCXMLLabel">
+          <property name="text">
+           <string>TextLabel</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QLabel" name="browseSCXMLLabel">
+            <property name="text">
+             <string>Select SCXML file</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="browseSCXML">
+            <property name="text">
+             <string>Browse</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
      </item>
      <item>
-      <widget class="QLabel" name="SCXMLLabel">
-       <property name="text">
-        <string>TextLabel</string>
+      <widget class="QGroupBox" name="groupBox_2">
+       <property name="title">
+        <string>Output directory</string>
        </property>
+       <layout class="QVBoxLayout" name="verticalLayout_4">
+        <item>
+         <widget class="QLabel" name="LogDirLabel">
+          <property name="text">
+           <string>TextLabel</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QLabel" name="browseLogDirLabel">
+            <property name="text">
+             <string>Select output directory</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="browseLogDir">
+            <property name="text">
+             <string>Browse</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
       </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
-        <widget class="QLabel" name="outDirLbl">
-         <property name="text">
-          <string>Choose an output directory :</string>
+        <widget class="QDialogButtonBox" name="buttonBox">
+         <property name="layoutDirection">
+          <enum>Qt::LeftToRight</enum>
          </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="browseLogDirectory">
-         <property name="text">
-          <string>Browse</string>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="standardButtons">
+          <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+         </property>
+         <property name="centerButtons">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item>
-      <widget class="QLabel" name="LogDirLabel">
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout_2">
-     <item>
-      <spacer name="verticalSpacer">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>
diff --git a/sdk/applications/actionstatemachine/ActionTransition.cpp b/sdk/applications/actionstatemachine/ActionTransition.cpp
index d9ae760f0d34f50cab1078a5d54afc9dc94f9907..1cd8d1c1a081cd806a906cb09ce2ea2eaf1a1f52 100644
--- a/sdk/applications/actionstatemachine/ActionTransition.cpp
+++ b/sdk/applications/actionstatemachine/ActionTransition.cpp
@@ -139,7 +139,7 @@ void ActionTransition::onTransition(QEvent* e) {
         QTime endTime = QTime::currentTime();
 
         (*logStream) << "\t\t<endTime>" << endTime.toString("hh:mm:ss:zzz") << "</endTime>" << endl;
-        (*logStream) << "\t\t<timeEnlapsed unit='ms'>" << (startTime->elapsed()) << "</timeEnlapsed>" << endl;
+        (*logStream) << "\t\t<timeElapsed unit='ms'>" << (startTime->elapsed()) << "</timeElapsed>" << endl;
         (*logStream)  << "\t</transition>" << endl;
     }
 }
diff --git a/sdk/applications/actionstatemachine/CMakeLists.txt b/sdk/applications/actionstatemachine/CMakeLists.txt
index 11055400faac8ca3cc24105c20c04fa20a1a68fb..e38020d3ea2af9eae101df2309bf83cee7f857ea 100644
--- a/sdk/applications/actionstatemachine/CMakeLists.txt
+++ b/sdk/applications/actionstatemachine/CMakeLists.txt
@@ -9,4 +9,30 @@ camitk_application(NEEDS_QT_MODULES #we use QtXML
 # Recursively update the shiboken path variable containing the CamiTK SDK tree structure
 set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "") 
 
-# TODO add two automatic test using the testdata scxml
+# Automatic tests
+set(TEST_BASENAME ${APPLICATION_TARGET_NAME})
+camitk_init_test(${TEST_BASENAME})
+
+# should pass because invoking camitk-actionstatemachine without arguments or with help
+# arg shows usage and exit success
+camitk_add_test(EXECUTABLE_ARGS "--help" PROJECT_NAME ${TEST_BASENAME} TEST_SUFFIX "-")
+camitk_add_test(EXECUTABLE_ARGS "-h"     PROJECT_NAME ${TEST_BASENAME} TEST_SUFFIX "-")
+
+# should pass because invoking testcomponents with a faulty arguments results in printing
+# an "Argument error" message (and exit failure)
+camitk_add_test(EXECUTABLE_ARGS "-badarg" 
+                PASS_REGULAR_EXPRESSION "unknown option '-badarg'"
+                PROJECT_NAME ${TEST_BASENAME} TEST_SUFFIX "-")
+
+# Testing using the testdata scxml  
+# note for the regular expression: 
+# as [ ] are regex wild card and " is not easy to escaped, all theses characters are replaced by .
+# see https://cmake.org/cmake/help/latest/command/string.html#regex-specification
+# for more information on CMake regex
+camitk_add_test(EXECUTABLE_ARGS "-f ${PROJECT_SOURCE_DIR}/sdk/applications/actionstatemachine/testdata/asmSimpleImageFilter.xml -o . -a" 
+                PASS_REGULAR_EXPRESSION ".INFO   . Application .camitk-actionstatemachine. - Exiting application..."
+                PROJECT_NAME ${TEST_BASENAME} TEST_SUFFIX "-")
+
+camitk_add_test(EXECUTABLE_ARGS "-f ${PROJECT_SOURCE_DIR}/sdk/applications/actionstatemachine/testdata/asmSimpleMeshProcessing.xml -o . -a" 
+                PASS_REGULAR_EXPRESSION ".INFO   . Application .camitk-actionstatemachine. - Exiting application..."
+                PROJECT_NAME ${TEST_BASENAME} TEST_SUFFIX "-")
diff --git a/sdk/applications/actionstatemachine/SaveActionState.cpp b/sdk/applications/actionstatemachine/SaveActionState.cpp
index 45a1992b41d434780015be40db305d37c8fc6134..b84b402f8a87d9a1d45e5f0e25c5ab23198130ac 100644
--- a/sdk/applications/actionstatemachine/SaveActionState.cpp
+++ b/sdk/applications/actionstatemachine/SaveActionState.cpp
@@ -52,12 +52,11 @@ Action::ApplyStatus SaveActionState::applyAction() {
     Action::ApplyStatus status(Action::TRIGGERED);
 
     if (logStream != nullptr) {
-        (*logStream) << "        <applyAction>" << endl;
-        (*logStream) << "            <name>" << myAction->getName() << "</name>" << endl;
-        (*logStream) << "            <inputs>" << endl;
+        (*logStream) << "\t\t<applyAction>" << endl;
+        (*logStream) << "\t\t\t<name>" << myAction->getName() << "</name>" << endl;
+        (*logStream) << "\t\t\t<inputs>" << endl;
     }
 
-
     // set input components
     ComponentList allComps = Application::getAllComponents();
     ComponentList::const_iterator compIt;
@@ -111,13 +110,13 @@ Action::ApplyStatus SaveActionState::applyAction() {
         inputComps.append((*compIt));
 
         if (logStream != NULL) {
-            (*logStream) << "                <component name='";
+            (*logStream) << "\t\t\t\t<component name='";
             (*logStream) << compDir + "/" + compName + compExt << "' type='" << compType << "'/>" << endl;
         }
     }
 
     if (logStream != nullptr) {
-        (*logStream) << "            </inputs>" << endl;
+        (*logStream) << "\t\t\t</inputs>" << endl;
     }
 
 
@@ -134,12 +133,10 @@ Action::ApplyStatus SaveActionState::applyAction() {
     }
 
     if (logStream != nullptr) {
-        (*logStream) << "            <status>" << Action::getStatusAsString(status) << "</status>" << endl;
-        (*logStream) << "        </applyAction>" << endl;
+        (*logStream) << "\t\t\t<status>" << Action::getStatusAsString(status) << "</status>" << endl;
+        (*logStream) << "\t\t</applyAction>" << endl;
     }
 
-
-
     Application::refresh();
 
     return status;
diff --git a/sdk/applications/actionstatemachine/resources/camitk-actionstatemachine.qrc b/sdk/applications/actionstatemachine/resources/camitk-actionstatemachine.qrc
index 5eb85285bb5f81d9c4993de6808cc0a9fb079df8..864c4d390a1f8b58bd83d5af24816b8f5e17aaf0 100644
--- a/sdk/applications/actionstatemachine/resources/camitk-actionstatemachine.qrc
+++ b/sdk/applications/actionstatemachine/resources/camitk-actionstatemachine.qrc
@@ -1,7 +1,6 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
     <qresource prefix="/">
-        <file alias="logXSL">log2html.xsl</file>
         <file alias="applicationIcon">camitk-actionstatemachine.xpm</file>
     </qresource>
 </RCC>
\ No newline at end of file
diff --git a/sdk/applications/actionstatemachine/resources/log2html.xsl b/sdk/applications/actionstatemachine/resources/log2html.xsl
deleted file mode 100644
index 16d6f05ae45f3389477147d06aad8dd7397e7407..0000000000000000000000000000000000000000
--- a/sdk/applications/actionstatemachine/resources/log2html.xsl
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/*****************************************************************************
- * $CAMITK_LICENCE_BEGIN$
- *
- * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2019 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
- *
- * Visit http://camitk.imag.fr for more information
- *
- * This file is part of CamiTK.
- *
- * CamiTK is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * CamiTK is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with CamiTK.  If not, see <http://www.gnu.org/licenses/>.
- *
- * $CAMITK_LICENCE_END$
- ****************************************************************************/
- 
-  XSL document to display an ActionStateMachine application log in HTML.
-  Can be used as a client-side XSLT
- 
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-                xmlns:log='http://ujf-grenoble.fr/camitk/logApplication'>
-    <xsl:output method="html"/>
-
-    <xsl:template match="/">
-        <html>
-            <head>
-                <title>Log of Application <xsl:value-of select="/log:application/log:name"/></title>
-                <style type="text/css">
-body {
-    background: gray;
-}
-
-.mainFrame {
-    border: 3px solid gray;
-    background: white;
-    -moz-border-radius: 20px;
-    -webkit-border-radius: 20px;
-    -khtml-border-radius: 20px;
-    border-radius: 40px;
-    margin-top:50px;
-    margin-bottom:50px;
-    margin-right:50px;
-    margin-left:50px;
-}
-
-.stateFrame {
-    margin-top:50px;
-    margin-bottom:50px;
-    margin-right:50px;
-    margin-left:50px;
-
-    /* make rounded borders */
-    border: 3px solid #ccc;
-    -moz-border-radius: 10px;
-    -webkit-border-radius: 10px;
-    -khtml-border-radius: 10px;
-    border-radius: 10px;
-
-    /* make a nice linear graidant */
-    background: #eef; /* Old browsers */
-    background: -moz-linear-gradient(top,  #eec; 0%, #ccc 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eee), color-stop(100%,#ccc)); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top,  #eee 0%,#ccc 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top,  #eee 0%,#ccc 100%); /* Opera 11.10+ */
-    background: -ms-linear-gradient(top,  #eee 0%,#ccc 100%); /* IE10+ */
-    background: linear-gradient(to bottom,  #eee 0%,#ccc 100%); /* W3C */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eee', endColorstr='#ccc',GradientType=0 ); /* IE6-9 */
-
-}
-
-h1 {
-    font-weight: bold;
-    font-size: 25px;
-    text-align: center;
-}
-
-h2 {
-    font-size: 20px;
-    text-align: center;
-    font-style: italic;
-}
-h3 {
-    font-size: 20px;
-    text-align: center;    
-}
-table {
-    border-width:1px;
-    border-style:solid;
-    border-color:#eee;
-    width:90%;
-    margin-left:5%;
-    margin-right:5%;
- }
-
-td {
-    text-align: center;
-    border-width:1px;
-    border-style:solid;
-    border-color:#ccc;
-}
-.enhanced {
-    font-size: 20px;
-    font-style: italic;
-    font-weight: bold;
-}
-.italic {
-    font-style: italic;
-}
-table.simple {
-    border-width:0px;
-}
-td.simple {
-    border-width: 0px;
-}
-
-.stateColor {
-    color: darkblue;
-}
-.actionColor {
-    color: darkred;
-}
-                </style>
-            </head>
-            <body>
-                <div class="mainFrame">                    
-                    <div class="stateFrame">
-                        <h1><xsl:value-of select="/log:application/log:name"/></h1>
-                        <h2>Log file</h2>
-                        <h3> Runned the <xsl:value-of select="/log:application/log:startDate"/></h3>
-                        <h3> Start: <xsl:value-of select="/log:application/log:startTime"/> Stop: <xsl:value-of select="/log:application/log:endTime"/> </h3>
-                        <h2> duration:  <xsl:call-template name="formatTime">
-                                            <xsl:with-param name="timeElapsed" select="/log:application/log:timeEnlapsed"/>
-                                        </xsl:call-template>
-                        </h2>
-                        <h3>Input xml file name: <xsl:value-of select="/log:application/log:inputXmlFile"/></h3>
-                    </div>
-
-                    <div class="stateFrame">
-                        <xsl:variable name="timeStateTotal"  select="sum(log:application/log:state/log:timeEnlapsed)"/>
-                        <xsl:variable name="timeActionTotal" select="sum(log:application/log:transition/log:timeEnlapsed)"/>
-
-                        <h3>Total time within states (action triggering): 
-                            <span class="stateColor">
-                                <xsl:call-template name="formatTime">
-                                    <xsl:with-param name="timeElapsed" select="sum(log:application/log:state/log:timeEnlapsed)"/>
-                                </xsl:call-template>
-                            (i.e., <xsl:value-of select="sum(log:application/log:state/log:timeEnlapsed)"/> ms)</span>
-                        </h3>
-                       
-                        <h3>Total time on action application: 
-                            <span class="actionColor">
-                                <xsl:call-template name="formatTime">
-                                    <xsl:with-param name="timeElapsed" select="sum(log:application/log:transition/log:timeEnlapsed)"/>
-                                </xsl:call-template>
-                                (i.e., <xsl:value-of select="sum(log:application/log:transition/log:timeEnlapsed)"/> ms)</span>
-                        </h3>
-                        <table>                            
-                            <tr>
-                                <td><h2>State</h2></td><td><h2>Duration</h2></td>
-                            </tr>                            
-                            <xsl:apply-templates select="/log:application/log:state | /log:application/log:transition"/>
-                        </table>
-                    </div>
-                    
-                </div>
-            </body>
-        </html>
-    </xsl:template>
-
-    <xsl:template match="log:state">
-        <xsl:variable name="count">
-            <xsl:number/>
-        </xsl:variable>
-        
-        <tr>
-            <td>
-                <span class="stateColor"><div class="enhanced">
-                <xsl:value-of select="$count"/> ) <xsl:value-of select="log:name"/>
-                </div></span>
-            </td>
-            <td>
-                <span class="stateColor">
-                    <xsl:call-template name="formatTime">
-                        <xsl:with-param name="timeElapsed" select="log:timeEnlapsed"/>
-                    </xsl:call-template>
-                </span>
-            </td>
-         </tr>
-    </xsl:template>
-    <xsl:template match="log:transition">
-        <xsl:apply-templates select="log:applyAction | log:closing"/>
-    </xsl:template>
-    <xsl:template match="log:applyAction">
-        
-        <tr>
-            <td colspan="2">
-                <span class="actionColor">
-                Action Applied: <span class="enhanced"><xsl:value-of select="log:name"/></span>
-                with status <span class="enhanced"><xsl:value-of select="log:status"/></span>
-                </span>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <table>
-                    <tr><td><span class="actionColor">Parameters</span></td>
-                        <td><span class="actionColor">Inputs</span></td>
-                        <td><span class="actionColor">Outputs</span></td></tr>
-                    <tr>
-                        <!-- for some action, the parameters and inputs are logged inside the <applyAction> element
-                             but for most of the action they are logged inside the <state> element.
-                             The two XPath expression below are selecting the <parameters> and <inputs> elements
-                             - inside the current <applyAction> element
-                             - as well as inside the preceding <state> element (which corresponds to the current state)
-                        -->
-                        <td><xsl:apply-templates select="log:parameters|../preceding-sibling::*[1]/log:parameters"/></td>
-                        <td><xsl:apply-templates select="log:inputs|../preceding-sibling::*[1]/log:inputs"/></td>                        
-                        <td><xsl:apply-templates select="log:outputs"/></td>
-                    </tr>
-                </table>
-            </td>
-            <td>
-                <span class="actionColor">
-                    <xsl:call-template name="formatTime">
-                        <xsl:with-param name="timeElapsed" select="../log:timeEnlapsed"/>
-                    </xsl:call-template>
-                </span>
-            </td>
-        </tr>
-    </xsl:template>
-    
-    <xsl:template match="log:closing">
-       <tr>
-            <td colspan="2">
-                <span class="actionColor"><span class="enhanced">Closing:</span></span>                
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <table class="simple">
-                    <xsl:apply-templates select="log:component"/>
-                </table>
-            </td>    
-            <td>
-                <span class="actionColor">
-                    <xsl:call-template name="formatTime">
-                        <xsl:with-param name="timeElapsed" select="../log:timeEnlapsed"/>
-                    </xsl:call-template>
-                </span>
-            </td>
-        </tr>
-    </xsl:template>
-    
-    <xsl:template match="log:parameters">
-        <table class="simple">
-            <tr>
-                <td>
-                    <span class="actionColor"><span class="italic">Name</span></span>
-                </td>
-                <td><span class="actionColor"><span class="italic">Value</span></span>
-                </td>
-            </tr>
-            <xsl:apply-templates select="log:parameter"/>
-        </table>
-    </xsl:template>
-
-    <xsl:template match="log:parameter">
-        <tr>
-            <td>
-                <span class="actionColor"><xsl:value-of select="@name"/></span>
-            </td>
-            <td>
-                <span class="actionColor"><xsl:value-of select="@value"/></span>
-            </td>
-        </tr>
-    </xsl:template>
-
-    <xsl:template match="log:outputs">
-        <table class="simple">
-            <tr>
-                <td>
-                    <span class="actionColor"><span class="italic">Type</span></span>
-                </td>
-                <td>
-                    <span class="actionColor"><span class="italic">Name</span></span>
-                </td>
-            </tr>
-            <xsl:apply-templates select="log:component"/>
-        </table>
-    </xsl:template>
-
-    <xsl:template match="log:inputs">
-        <table class="simple">
-            <tr>
-                <td>
-                    <span class="actionColor"><span class="italic">Type</span></span>
-                </td>
-                <td>
-                    <span class="actionColor"><span class="italic">Name</span></span>
-                </td>
-            </tr>
-            <xsl:apply-templates select="log:component"/>
-        </table>
-    </xsl:template>
-
-    <xsl:template match="log:component">
-        <tr>
-            <td>
-                <span class="actionColor"><xsl:value-of select="@type"/></span>
-            </td>
-            <td>
-                <span class="actionColor"><xsl:value-of select="@name"/></span>
-            </td>
-        </tr>
-    </xsl:template>
-    
-    <xsl:template name="formatTime">
-        <xsl:param name="timeElapsed" select="/log:application/log:timeEnlapsed"/>
-        <!--
-            int milisec = (startTime->elapsed());
-            int mili    = milisec % 1000;
-            int seconds = ((milisec % (3600000)) % (60000)) / 1000;
-            int minutes = (milisec % (3600000)) / (60000);
-            int hours   = milisec / (3600000);
-        -->
-        <xsl:variable name="hours"    select="floor($timeElapsed div 3600000)"/>
-        <xsl:variable name="minutes"  select="floor(($timeElapsed - $hours * 3600000) div 60000)"/>
-        <xsl:variable name="secondes" select="floor(($timeElapsed - $hours * 3600000 - $minutes * 60000) div 1000)"/>
-        <xsl:variable name="msec"     select="floor($timeElapsed - $hours * 3600000 - $minutes * 60000 -$secondes * 1000)"/>        <xsl:if test="$hours > 0"><xsl:value-of select="$hours"/> h </xsl:if>
-        <xsl:if test="$minutes > 0"><xsl:value-of select="$minutes"/> min </xsl:if>
-        <xsl:if test="$secondes > 0"><xsl:value-of select="$secondes"/> s </xsl:if>
-        <xsl:if test="$msec > 0"><xsl:value-of select="$msec"/> ms</xsl:if>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/sdk/applications/actionstatemachine/testdata/asmSimpleImageFilter.xml b/sdk/applications/actionstatemachine/testdata/asmSimpleImageFilter.xml
index 83a88000d6832e05386fb38531bb253c4ab9d7b4..f4e73db2293416e50db1afd366758ac7c891cd27 100644
--- a/sdk/applications/actionstatemachine/testdata/asmSimpleImageFilter.xml
+++ b/sdk/applications/actionstatemachine/testdata/asmSimpleImageFilter.xml
@@ -43,6 +43,7 @@ This Action State Machine performs a very simple image processing pipeline:<br/>
         </onentry>
         <transition event="Next" target="Image Open" applyAction="true"/>
     </state>
+    
     <state id="Image Open">
         <onentry>
             <camitk:onState>
diff --git a/sdk/applications/actionstatemachine/testdata/asmSimpleMeshProcessing.xml b/sdk/applications/actionstatemachine/testdata/asmSimpleMeshProcessing.xml
index 9a5faa861b54b57023e9a78cb80c3b04aba243c6..ed387f6d82e6eb67eddfad4817a5fc48ed5839cd 100644
--- a/sdk/applications/actionstatemachine/testdata/asmSimpleMeshProcessing.xml
+++ b/sdk/applications/actionstatemachine/testdata/asmSimpleMeshProcessing.xml
@@ -84,6 +84,28 @@ to the testdata directory before running.
                 </camitk:close>
             </camitk:onTransition>
         </transition>
+        <transition event="Next" target="Save Mesh" applyAction="true"/>
+    </state>
+
+    <state id="Save Mesh">
+        <onentry>
+            <camitk:onState>
+                <camitk:description>Save the decimated mesh</camitk:description>
+                <camitk:action>
+                    <camitk:name>Save</camitk:name>
+                    <camitk:inputs>
+                         <camitk:component type="MeshComponent" name="decimatedMesh"  suffix=".vtk"/>
+                    </camitk:inputs>
+                </camitk:action>
+            </camitk:onState>
+        </onentry>
+        <transition event="Back" target="Mesh Decimation" applyAction="false">
+            <camitk:onTransition>
+                <camitk:close>
+                    <camitk:component type="MeshComponent" name="decimatedMesh"/>
+                </camitk:close>
+            </camitk:onTransition>
+        </transition>		
         <transition event="Next" target="Force Close" applyAction="true"/>
     </state>
 
diff --git a/sdk/viewers/explorer/Explorer.cpp b/sdk/viewers/explorer/Explorer.cpp
index 8f4d1d439e4f57caefbc9fc58d6b0bf9e01d0dac..1af8948cf4d941740a5fd34d831fd52858a7109f 100644
--- a/sdk/viewers/explorer/Explorer.cpp
+++ b/sdk/viewers/explorer/Explorer.cpp
@@ -53,11 +53,6 @@ Explorer::Explorer(QString name) : Viewer(name, Viewer::DOCKED) {
 
 //----------------------- destructor ------------------------
 Explorer::~Explorer() {
-    // remove all vector actors
-    while (!itemComponentMap.values().empty()) {
-        delete itemComponentMap.values().takeFirst();
-    }
-
     delete explorerTree;
     explorerTree = nullptr;
 
@@ -196,7 +191,7 @@ QTreeWidgetItem* Explorer::getItem(Component* comp) {
 //----------------------- getNewItem ------------------------
 QTreeWidgetItem* Explorer::getNewItem(QTreeWidgetItem* parent, Component* abstractNode) {
     //-- create the tree widget for abstractNode
-    auto* tw = new QTreeWidgetItem(parent);
+    QTreeWidgetItem* tw = new QTreeWidgetItem(parent);
     // set the first column (#0)
     QString itemText = abstractNode->getName();