2 files changed, 9 insertions, 3 deletions

diff --git a/src/uscxml/interpreter/BasicContentExecutor.cpp b/src/uscxml/interpreter/BasicContentExecutor.cpp
index 17dd611..820a945 100644
--- a/src/uscxml/interpreter/BasicContentExecutor.cpp
+++ b/src/uscxml/interpreter/BasicContentExecutor.cpp
@@ -276,10 +276,16 @@ void BasicContentExecutor::processLog(XERCESC_NS::DOMElement* content) {
 	std::string expr = ATTR(content, kXMLCharExpr);
 
 	Data d = _callbacks->evalAsData(expr);
+#if 1
 	if (label.size() > 0) {
 		_callbacks->getLogger().log(USCXML_LOG) << label << ": ";
 	}
 	_callbacks->getLogger().log(USCXML_LOG) << d << std::endl;
+#else
+	// see issue113
+	_callbacks->getLogger().log(USCXML_LOG) << (label.size() > 0 ? label + ":" : "") << d << std::endl;
+#endif
+
 }
 
 void BasicContentExecutor::processScript(XERCESC_NS::DOMElement* content) {
diff --git a/src/uscxml/interpreter/StdOutLogger.cpp b/src/uscxml/interpreter/StdOutLogger.cpp
index 3f954d6..76a2169 100644
--- a/src/uscxml/interpreter/StdOutLogger.cpp
+++ b/src/uscxml/interpreter/StdOutLogger.cpp
@@ -27,15 +27,15 @@ std::shared_ptr<LoggerImpl> StdOutLogger::create() {
 }
 
 void StdOutLogger::log(LogSeverity severity, const std::string& message) {
-	std::cout << (severity != USCXML_VERBATIM ? Logger::severityToString(severity) + ": " : "") << message << std::endl;
+	std::cout << (severity != USCXML_VERBATIM ? Logger::severityToString(severity) + ": " : "") << message << std::flush;
 }
 
 void StdOutLogger::log(LogSeverity severity, const Event& event) {
-	std::cout << (severity != USCXML_VERBATIM ? Logger::severityToString(severity) + ": " : "") << event << std::endl;
+	std::cout << (severity != USCXML_VERBATIM ? Logger::severityToString(severity) + ": " : "") << event << std::flush;
 }
 
 void StdOutLogger::log(LogSeverity severity, const Data& data) {
-	std::cout << (severity != USCXML_VERBATIM ? Logger::severityToString(severity) + ": " : "") << data << std::endl;
+	std::cout << (severity != USCXML_VERBATIM ? Logger::severityToString(severity) + ": " : "") << data << std::flush;
 }
 
 }