diff --git a/CMakeLists.txt b/CMakeLists.txt
index 483fb18..b5c3dda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ if (INSTALL_Q3DMASC_PLUGIN)
 	project( Q3DMASC_PLUGIN )
 
 	AddPlugin( NAME ${PROJECT_NAME} )
-	set(Q3DMASC_PLUGIN_VERSION "0.4+")
+	set(Q3DMASC_PLUGIN_VERSION "0.5")
 
 	include( CMakePolicies NO_POLICY_SCOPE )
 
diff --git a/ContextBasedFeature.cpp b/ContextBasedFeature.cpp
index c38fa60..64570cb 100644
--- a/ContextBasedFeature.cpp
+++ b/ContextBasedFeature.cpp
@@ -148,7 +148,7 @@ bool ContextBasedFeature::prepare(	const CorePoints& corePoints,
 		unsigned pointCount = corePoints.size();
 		QString logMessage = QString("Computing %1 on cloud %2 with context cloud %3\n(core points: %4)").arg(typeStr).arg(corePoints.cloud->getName()).arg(cloud2Label).arg(pointCount);
 
-		//first: look for the number of points that 
+		//first: look for the number of points in the relevent class
 		const ScalarType fClass = static_cast<ScalarType>(ctxClassLabel);
 		unsigned classCount = 0;
 		for (unsigned i = 0; i < classifSF->size(); ++i)
diff --git a/Train3DMASCDialog.ui b/Train3DMASCDialog.ui
index d226cd3..3faf85a 100644
--- a/Train3DMASCDialog.ui
+++ b/Train3DMASCDialog.ui
@@ -150,7 +150,7 @@
       <item row="3" column="0">
        <widget class="QCheckBox" name="checkBox_useExistingScalarFields">
         <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You the existing feature for the training. If not checked, all features will be recalculated and the existing features will be overwritten.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use the existing features, when available, for the training. If not checked, all features will be recalculated and the existing features will be overwritten.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Use existing attributes</string>
diff --git a/q3DMASCTools.cpp b/q3DMASCTools.cpp
index fbf7211..213c657 100644
--- a/q3DMASCTools.cpp
+++ b/q3DMASCTools.cpp
@@ -300,6 +300,7 @@ static bool CreateFeaturesFromCommand(const QString& command, QString corePoints
 	int cloudCount = 0;
 	bool statDefined = false;
 	bool mathDefined = false;
+	bool contextBasedFeatureDeprecatedSyntax = false;
 	for (int i = 2; i < tokens.size(); ++i)
 	{
 		QString token = tokens[i].trimmed().toUpper();
@@ -360,19 +361,21 @@ static bool CreateFeaturesFromCommand(const QString& command, QString corePoints
 
 						if (feature && feature->getType() == Feature::Type::ContextBasedFeature)
 						{
-							//only one cloud is necessary for context based features
-							//and the class is just after the cloud name
+							// only one cloud is necessary for context based features
+							// the class should be just after the cloud name in the regular syntax
 							if (i + 1 < tokens.size())
 							{
 								bool ok = false;
 								int classLabel = tokens[i + 1].toInt(&ok);
 								if (!ok)
 								{
-									ccLog::Warning(QString("Malformed file: expecting a class number after the context cloud '%1' on line #%2").arg(token).arg(lineNumber));
-									return false;
+									contextBasedFeatureDeprecatedSyntax = true; // let's try the deprecated syntax
+								}
+								else
+								{
+									qSharedPointerCast<ContextBasedFeature>(feature)->ctxClassLabel = classLabel;
+									++i;
 								}
-								qSharedPointerCast<ContextBasedFeature>(feature)->ctxClassLabel = classLabel;
-								++i;
 							}
 							else
 							{
@@ -380,11 +383,47 @@ static bool CreateFeaturesFromCommand(const QString& command, QString corePoints
 								return false;
 							}
 						}
+
 					}
 					else if (cloudCount == 1)
 					{
-						feature->cloud2 = it.value();
-						feature->cloud2Label = key;
+						if (contextBasedFeatureDeprecatedSyntax)
+						{
+							feature->cloud1 = it.value();
+							feature->cloud1Label = key;
+						}
+						else
+						{
+							feature->cloud2 = it.value();
+							feature->cloud2Label = key;
+						}
+
+						if (feature && feature->getType() == Feature::Type::ContextBasedFeature)
+						{
+							// this is the DEPRECATED syntax for the context based feature
+							// the class is just after the cloud name
+							if (i + 1 < tokens.size())
+							{
+								bool ok = false;
+								int classLabel = tokens[i + 1].toInt(&ok);
+								if (!ok)
+								{
+									ccLog::Warning(QString("ContextBasedFeature: expecting a class number after the context cloud '%1' on line #%2").arg(token).arg(lineNumber));
+									return false;
+								}
+								else
+								{
+									ccLog::Warning(QString("ContextBasedFeature: you are using the DEPRECATED syntax").arg(token).arg(lineNumber));
+									qSharedPointerCast<ContextBasedFeature>(feature)->ctxClassLabel = classLabel;
+									++i;
+								}
+							}
+							else
+							{
+								ccLog::Warning(QString("Malformed context based features at line %1").arg(lineNumber));
+								return false;
+							}
+						}
 					}
 					else
 					{
@@ -1255,13 +1294,13 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
 						//Context-based features
 						for (ContextBasedFeature::Shared& feature : fas.contextBasedFeaturesPerScale[currentScale])
 						{
-							if (feature->cloud2 == sourceCloud && feature->sf && !feature->valueAlreadyComputed)
+							if (feature->cloud1 == sourceCloud && feature->sf && !feature->valueAlreadyComputed)
 							{
 								ScalarType outputValue = 0;
 								if (!feature->computeValue(nNSS.pointsInNeighbourhood, nNSS.queryPoint, outputValue))
 								{
 									//an error occurred
-									errorStr = "An error occurred during the computation of feature " + feature->toString() + "on cloud " + feature->cloud2->getName();
+									errorStr = "An error occurred during the computation of feature " + feature->toString() + "on cloud " + feature->cloud1->getName();
 									success = false;
 									break;
 								}