Index: /issm/trunk-jpl/src/m/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/m/Makefile.am	(revision 20810)
+++ /issm/trunk-jpl/src/m/Makefile.am	(revision 20811)
@@ -32,4 +32,5 @@
 					${ISSM_DIR}/src/m/mesh/rifts/*.m \
 					${ISSM_DIR}/src/m/miscellaneous/*.m \
+					${ISSM_DIR}/src/m/modules/*.m \
 					${ISSM_DIR}/src/m/os/*.m \
 					${ISSM_DIR}/src/m/plot/*.m \
@@ -65,4 +66,5 @@
 					${ISSM_DIR}/src/m/mesh/rifts/*.py \
 					${ISSM_DIR}/src/m/miscellaneous/*.py \
+					${ISSM_DIR}/src/m/modules/*.py \
 					${ISSM_DIR}/src/m/os/*.py \
 					${ISSM_DIR}/src/m/plot/*.py \
Index: /issm/trunk-jpl/src/m/modules/ContourToNodes.m
===================================================================
--- /issm/trunk-jpl/src/m/modules/ContourToNodes.m	(revision 20811)
+++ /issm/trunk-jpl/src/m/modules/ContourToNodes.m	(revision 20811)
@@ -0,0 +1,19 @@
+function flags = ContourToNodes(x,y,contourname,edgevalue);
+%CONTOURTONODES - flags vertices inside contour
+%
+%   Usage:
+%      flags = ContourToNodes(x,y,contourname,edgevalue);
+%
+%   x,y: list of nodes
+%   contourname: name of .exp file containing the contours, or resulting structure from call to expread
+%   edgevalue: integer (0, 1 or 2) defining the value associated to the nodes on the edges of the polygons
+%   flags: vector of flags (0 or 1), of size nodes
+
+%Check usage
+if nargin~=4,
+	help ContourToNodes
+	error('Wrong usage (see above)');
+end
+
+%Call mex module
+[flags] = ContourToNodes_matlab(x,y,contourname,edgevalue);
Index: /issm/trunk-jpl/src/m/modules/ContourToNodes.py
===================================================================
--- /issm/trunk-jpl/src/m/modules/ContourToNodes.py	(revision 20811)
+++ /issm/trunk-jpl/src/m/modules/ContourToNodes.py	(revision 20811)
@@ -0,0 +1,20 @@
+from ContourToNodes_python import ContourToNodes_python
+
+def ContourToNodes(x,y,contourname,edgevalue):
+	"""
+	CONTOURTONODES - flags vertices inside contour
+
+		Usage:
+			flags = ContourToNodes(x,y,contourname,edgevalue);
+
+		x,y: list of nodes
+		contourname: name of .exp file containing the contours, or resulting structure from call to expread
+		edgevalue: integer (0, 1 or 2) defining the value associated to the nodes on the edges of the polygons
+		flags: vector of flags (0 or 1), of size nodes
+	"""
+
+	#Call mex module
+	[flags] = ContourToNodes_python(x,y,contourname,edgevalue);
+
+	#return
+	return flags
Index: /issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.cpp	(revision 20810)
+++ /issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.cpp	(revision 20811)
@@ -15,5 +15,5 @@
 	_printf_("\n");
 }/*}}}*/
-WRAPPER(ContourToNodes){
+WRAPPER(ContourToNodes_python){
 
 	/* input: */
Index: /issm/trunk-jpl/src/wrappers/matlab/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/wrappers/matlab/Makefile.am	(revision 20810)
+++ /issm/trunk-jpl/src/wrappers/matlab/Makefile.am	(revision 20811)
@@ -41,5 +41,5 @@
 						 BamgTriangulate.la\
 						 ContourToMesh.la\
-						 ContourToNodes.la\
+						 ContourToNodes_matlab.la\
 						 DistanceToMaskBoundary.la\
 						 ElementConnectivity.la\
@@ -161,7 +161,6 @@
 ExpToLevelSet_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
 
-
-ContourToNodes_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp
-ContourToNodes_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
+ContourToNodes_matlab_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp
+ContourToNodes_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
 
 DistanceToMaskBoundary_la_SOURCES = ../DistanceToMaskBoundary/DistanceToMaskBoundary.cpp
Index: /issm/trunk-jpl/src/wrappers/python/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/wrappers/python/Makefile.am	(revision 20810)
+++ /issm/trunk-jpl/src/wrappers/python/Makefile.am	(revision 20811)
@@ -31,5 +31,5 @@
 						BamgMesher.la\
 						ContourToMesh.la\
-						ContourToNodes.la\
+						ContourToNodes_python.la\
 						ElementConnectivity.la\
 						EnumToString.la\
@@ -99,6 +99,6 @@
 ContourToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
 
-ContourToNodes_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp
-ContourToNodes_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
+ContourToNodes_python_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp
+ContourToNodes_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
 
 ElementConnectivity_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp