diff --git a/ITKSoftwareGuide.cmake b/ITKSoftwareGuide.cmake
index 349461e6..806fd61e 100644
--- a/ITKSoftwareGuide.cmake
+++ b/ITKSoftwareGuide.cmake
@@ -19,7 +19,7 @@ include(${ITK_USE_FILE})
 
 if( NOT IS_DIRECTORY "${ITK_SOURCE_DIR}" )
   message(FATAL_ERROR "ITK source directory is not set :${ITK_SOURCE_DIR}:")
-endif()
+endif() 
 if( NOT IS_DIRECTORY "${ITK_BINARY_DIR}" )
   message(FATAL_ERROR "ITK build directory is not set :${ITK_BINARY_DIR}:")
 endif()
@@ -28,11 +28,13 @@ endif()
 enable_testing()
 include(CTest)
 
+if (NOT ${USE_SYSTEM_ITK})
 #-----------------------------------------------------------------------
 # Setup locations to find externally maintained test data.
 #-----------------------------------------------------------------------
-include(${PROJECT_NAME}ExternalData)
+   include(${PROJECT_NAME}ExternalData)
 
-add_subdirectory(SoftwareGuide)
+   add_subdirectory(SoftwareGuide)
 
-ExternalData_Add_Target( ${PROJECT_NAME}FetchData )  # Name of data management target
+   ExternalData_Add_Target( ${PROJECT_NAME}FetchData )  # Name of data management target
+endif()
diff --git a/SoftwareGuide/Examples/CMakeLists.txt b/SoftwareGuide/Examples/CMakeLists.txt
index c8b475db..bb41d454 100644
--- a/SoftwareGuide/Examples/CMakeLists.txt
+++ b/SoftwareGuide/Examples/CMakeLists.txt
@@ -74,6 +74,7 @@ find_path(ITK_EXECUTABLES_DIR
   "${ITK_BINARY_DIR}/../bin"
   "${ITK_BINARY_DIR}/../bin/Release"
   "${ITK_BINARY_DIR}/../bin/Debug"
+  "${ITK_BINARY_DIR}/Wrapping/Generators/Python/itk/"
   "${ITK_BINARY_DIR}/../bin/RelWithDebInfo"
   "${ITK_BINARY_DIR}/../bin/MinSizeRel"
   DOC "Where the ITK examples executables are"
diff --git a/SoftwareGuide/Examples/RunExamples.py b/SoftwareGuide/Examples/RunExamples.py
index c9136e75..a6436eed 100644
--- a/SoftwareGuide/Examples/RunExamples.py
+++ b/SoftwareGuide/Examples/RunExamples.py
@@ -213,7 +213,7 @@ def ParseOneFile(sourceFile, pathFinder):
         # Read each line and Parse the input file
         #
         # Get the command line args from the source file
-    sf = open(sourceFile, 'r')
+    sf = open(sourceFile, 'r',encoding="ISO-8859-1")
     INFILE = sf.readlines()
     sf.close()
     parseLine = 0
diff --git a/TODO b/TODO
index 4f533d13..1c7d2a56 100644
--- a/TODO
+++ b/TODO
@@ -12,7 +12,7 @@ Get output images only produced in BINARY_DIR.
 -- Describe Modularization as part of a ITKv3->ITKv4 transition appendix
 -- Update Acknowledgements
 -- Test clean builds
--- Suport "USE_SYSTEM_ITK"
+-- Support "USE_SYSTEM_ITK"
 
 ==========================================================
 This is a list of potential topics to be added to the Software Guide.