diff --git a/EX01_loadMeasurement.py b/EX01_loadMeasurement.py
index a8a13f4..e971a57 100644
--- a/EX01_loadMeasurement.py
+++ b/EX01_loadMeasurement.py
@@ -30,8 +30,8 @@ def run_example_loadMeasurement(
         userSettingsDir=loc_settings,
         measurementLoc=loc_file):
     print("loading user settings...")
-    settings = cuvis.General(userSettingsDir)
-    settings.set_log_level("info")
+    cuvis.init(userSettingsDir)
+    cuvis.set_log_level("info")
 
     print("loading session...")
     session = cuvis.SessionFile(measurementLoc)
@@ -72,8 +72,8 @@ def run_example_loadMeasurement(
     plt.title("Spectrum of {} for x={}, y={}".format(mesu.name, x, y))
     plt.show()
 
+    cuvis.shutdown()
     print("finished.")
-    pass
 
 
 if __name__ == "__main__":
diff --git a/EX02_reprocessMeasurement.py b/EX02_reprocessMeasurement.py
index 6af55f0..f0e8617 100644
--- a/EX02_reprocessMeasurement.py
+++ b/EX02_reprocessMeasurement.py
@@ -44,8 +44,8 @@ def run_example_reprocessMeasurement(
         distanceLoc=loc_distance,
         outDir=loc_output):
     print("loading user settings...")
-    settings = cuvis.General(userSettingsDir)
-    settings.set_log_level("info")
+    cuvis.init(userSettingsDir)
+    cuvis.set_log_level("info")
 
     print("loading measurement file...")
     sessionM = cuvis.SessionFile(measurementLoc)
@@ -107,10 +107,9 @@ def run_example_reprocessMeasurement(
         else:
             print("Cannot process to {} mode!".format(mode))
 
+    cuvis.shutdown()
     print("finished.")
 
-    pass
-
 
 if __name__ == "__main__":
 
diff --git a/EX03_exportMeasurement.py b/EX03_exportMeasurement.py
index cab0255..1c502ac 100644
--- a/EX03_exportMeasurement.py
+++ b/EX03_exportMeasurement.py
@@ -41,8 +41,8 @@ def run_example_exportMeasurement(userSettingsDir=loc_settings,
                                   pluginLoc=loc_plugin,
                                   exportDir=loc_output):
     print("loading user settings...")
-    settings = cuvis.General(userSettingsDir)
-    settings.set_log_level("info")
+    cuvis.init(userSettingsDir)
+    cuvis.set_log_level("info")
 
     print("loading session file...")
     session = cuvis.SessionFile(measurementLoc)
@@ -84,7 +84,8 @@ def run_example_exportMeasurement(userSettingsDir=loc_settings,
     viewExporter = cuvis.ViewExporter(view_export_settings)
     viewExporter.apply(mesu)
 
-    pass
+    cuvis.shutdown()
+    print("finished.")
 
 
 if __name__ == "__main__":
diff --git a/EX04_changeDistance.py b/EX04_changeDistance.py
index c52bf60..b665bb0 100644
--- a/EX04_changeDistance.py
+++ b/EX04_changeDistance.py
@@ -33,8 +33,8 @@ def run_example_changeDistance(userSettingsDir=loc_settings,
                                distance=loc_distance,
                                exportDir=loc_output):
     print("loading user settings...")
-    settings = cuvis.General(userSettingsDir)
-    settings.set_log_level("info")
+    cuvis.init(userSettingsDir)
+    cuvis.set_log_level("info")
 
     print("loading session file...")
     session = cuvis.SessionFile(measurementLoc)
@@ -67,10 +67,10 @@ def run_example_changeDistance(userSettingsDir=loc_settings,
     print(mesu.distance)
     print("saving...")
     mesu.save(saveArgs)
+    
+    cuvis.shutdown()
     print("finished.")
 
-    pass
-
 
 if __name__ == "__main__":
 
diff --git a/EX05_recordSingleImages.py b/EX05_recordSingleImages.py
index 7c29669..e3ef8f9 100644
--- a/EX05_recordSingleImages.py
+++ b/EX05_recordSingleImages.py
@@ -40,8 +40,8 @@ def run_example_recordSingleImage(
         exposure=loc_exptime,
         nrImgs=loc_nimgs):
     print("loading user settings...")
-    settings = cuvis.General(userSettingsDir)
-    settings.set_log_level("info")
+    cuvis.init(userSettingsDir)
+    cuvis.set_log_level("info")
 
     print(
         "loading calibration, processing and acquisition context (factory)...")
@@ -77,10 +77,9 @@ def run_example_recordSingleImage(
         else:
             print("failed")
 
+    cuvis.shutdown()
     print("finished.")
 
-    pass
-
 
 if __name__ == "__main__":
     print("Example 05: Record single image. Please provide:")
diff --git a/EX05_recordSingleImages_async.py b/EX05_recordSingleImages_async.py
index c626fd6..9d8338d 100644
--- a/EX05_recordSingleImages_async.py
+++ b/EX05_recordSingleImages_async.py
@@ -42,8 +42,8 @@ async def run_example_recordSingleImage(
         exposure=loc_exptime,
         nrImgs=loc_nimgs):
     print("loading user settings...")
-    settings = cuvis.General(userSettingsDir)
-    settings.set_log_level("info")
+    cuvis.init(userSettingsDir)
+    cuvis.set_log_level("info")
 
     print(
         "loading calibration, processing and acquisition context (factory)...")
@@ -76,10 +76,9 @@ async def run_example_recordSingleImage(
         else:
             print("failed")
 
+    cuvis.shutdown()
     print("finished.")
 
-    pass
-
 
 if __name__ == "__main__":
     print("Example 05: Record single image. Please provide:")
diff --git a/EX06_recordVideo.py b/EX06_recordVideo.py
index c30931b..fbb5528 100644
--- a/EX06_recordVideo.py
+++ b/EX06_recordVideo.py
@@ -42,8 +42,8 @@ def run_example_recordVideo(userSettingsDir=loc_settings,
                             autoExp=loc_autoexp,
                             fps=loc_fps):
     print("loading user settings...")
-    settings = cuvis.General(userSettingsDir)
-    settings.set_log_level("info")
+    cuvis.init(userSettingsDir)
+    cuvis.set_log_level("info")
 
     print("loading calibration (factory)...")
     calibration = cuvis.Calibration(factoryDir)
@@ -124,10 +124,10 @@ def run_example_recordVideo(userSettingsDir=loc_settings,
 
     print("acquisition stopped...")
     acquisitionContext.set_continuous(False)
+    
+    cuvis.shutdown()
     print("finished.")
 
-    pass
-
 
 if __name__ == "__main__":
     print("Example 06: Record video file. Please provide:")
diff --git a/EX06_recordVideo_async.py b/EX06_recordVideo_async.py
index aa2a52b..83f1229 100644
--- a/EX06_recordVideo_async.py
+++ b/EX06_recordVideo_async.py
@@ -52,9 +52,9 @@ async def run_example_recordVideo(userSettingsDir=loc_settings,
                             autoExp=loc_autoexp,
                             fps=loc_fps):
     print("loading user settings...")
-    settings = cuvis.General(userSettingsDir)
-    settings.set_log_level("info")
-
+    cuvis.init(userSettingsDir)
+    cuvis.set_log_level("info")
+    
     print("loading calibration (factory)...")
     calibration = cuvis.Calibration(factoryDir)
 
@@ -122,10 +122,10 @@ async def run_example_recordVideo(userSettingsDir=loc_settings,
 
     print("acquisition stopped...")
     await acquisitionContext.set_continuous_async(False)
+    
+    cuvis.shutdown()
     print("finished.")
 
-    pass
-
 
 if __name__ == "__main__":
     print("Example 06: Record video file. Please provide:")
diff --git a/EX07_recordVideoFromSessionFile.py b/EX07_recordVideoFromSessionFile.py
index 95cd015..2803a93 100644
--- a/EX07_recordVideoFromSessionFile.py
+++ b/EX07_recordVideoFromSessionFile.py
@@ -42,8 +42,8 @@ def run_example_recordVideoFromSessionFile(userSettingsDir=loc_settings,
                                            autoExp=loc_autoexp,
                                            fps=loc_fps):
     print("loading user settings...")
-    settings = cuvis.General(userSettingsDir)
-    settings.set_log_level("info")
+    cuvis.init(userSettingsDir)
+    cuvis.set_log_level("info")
 
     print("loading session file ...")
     session = cuvis.SessionFile(measurementLoc)
@@ -126,10 +126,10 @@ def run_example_recordVideoFromSessionFile(userSettingsDir=loc_settings,
 
     print("acquisition stopped...")
     acquisitionContext.set_continuous(False)
+    
+    cuvis.shutdown()
     print("finished.")
 
-    pass
-
 
 if __name__ == "__main__":
     print("Example 07: Record video from session file. Please provide:")