diff --git a/moose-core/pymoose/CMakeLists.txt b/moose-core/pymoose/CMakeLists.txt
index d8ee56dbf99c0c8123b37d6e5a79821f5a0d9be2..af4e8e749a827b113267d557ba89f7071277ff14 100644
--- a/moose-core/pymoose/CMakeLists.txt
+++ b/moose-core/pymoose/CMakeLists.txt
@@ -1,6 +1,8 @@
 add_definitions(-DPYMOOSE)
 include_directories(../basecode ../msg)
 
+find_package( PythonInterp REQUIRED )
+
 set(PYMOOSE_SRCS 
     moosemodule.cpp
     vec.cpp
@@ -18,6 +20,8 @@ EXEC_PROGRAM(${PYTHON_EXECUTABLE}
 except Exception: pass'"
     OUTPUT_VARIABLE PYTHON_SO_EXTENSION
     )
+
+message( STATUS "Python path ${PYTHON_EXECUTABLE}" )
 message( STATUS "Python so extension ${PYTHON_SO_EXTENSION}" )
 
 find_package(NumPy REQUIRED)
@@ -26,6 +30,8 @@ find_package(PythonLibs REQUIRED)
 include_directories( ${NUMPY_INCLUDE_DIRS} )
 include_directories( ${PYTHON_INCLUDE_DIRS} )
 
+message( STATUS "Python include dir : ${PYTHON_INCLUDE_DIRS} " )
+
 add_definitions(-DUSE_NUMPY)
 
 add_definitions(-DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION)
@@ -38,7 +44,12 @@ execute_process( COMMAND ${PYTHON_EXECUTABLE}-config --libs
     OUTPUT_VARIABLE PYTHON_LIBRARIES
     OUTPUT_STRIP_TRAILING_WHITESPACE
     )
+
+if( NOT PYTHON_INCLUDE_FLAGS )
+    set( PYTHON_INCLUDE_FLAGS "-I ${PYTHON_INCLUDE_DIRS} " )
+endif( )
 message( STATUS "Python include flags: ${PYTHON_INCLUDE_FLAGS}" )
+
 set_target_properties(_moose PROPERTIES 
     COMPILE_DEFINITIONS "PYMOOSE"
     COMPILE_FLAGS "${PYTHON_INCLUDE_FLAGS}"
@@ -47,11 +58,6 @@ set_target_properties(_moose PROPERTIES
     SUFFIX ".so"
     )
 
-#if(NOT(PYTHON_SO_EXTENSION STREQUAL ""))
-#    set_target_properties(_moose PROPERTIES
-#    SUFFIX ${PYTHON_SO_EXTENSION})
-#endif()
-
 # see issue #80
 if(HDF5_LIBRARY_DIRS)
     set_target_properties( _moose PROPERTIES LINK_FLAGS "-L${HDF5_LIBRARY_DIRS}" )
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 45a9402dc3f4fc0935b87579b3746f36bdcd5a5f..d4d57fefc249d005e4aa58ba6dfca9e8df6c53cb 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -20,7 +20,7 @@ parts:
   desktop:
       plugin: cmake
       configflags: [ "-DCMAKE_INSTALL_PREFIX=/usr" ]
-      source : https://github.com/BhallaLab/moose.git
+      source : . # https://github.com/BhallaLab/moose.git
       build-packages:
           - cmake
           - g++