diff --git a/README.md b/README.md
index f685f68855423e5ae55111f10817602cb3b14507..4aeebb25176d5d6baaff5e436e797ad7bed6d9fb 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Additionally, a basic simulator interface can be used during DAQ logic developme
 Prerequisites
 -------------
  - libusb1-dev
- - SWIG 3 (v4 currently not supported)
+ - SWIG v4
  - numpy
  - pytango (optionally, only when using the tango server)
  
diff --git a/examples/simple_connection.py b/examples/simple_connection.py
index f04106cc59e98928e8a31231c23364977ebfcd92..e2a9e7db0ad738efd447ae032429c461e64d9918 100644
--- a/examples/simple_connection.py
+++ b/examples/simple_connection.py
@@ -19,8 +19,9 @@ amptek = ahi.AmptekHardwareInterface()
 # To connect to a specific device, change the -1 to the serial number
 # For basic tests, the simulator interface can be used, of no hardware is available.
 # Use amptek.connectSimulator() instead
-amptek.connectUSB(-1)
 
+amptek.connectUSB(-1)
+# amptek.connectSimulator()
 
 
 
diff --git a/python/amptek_hardware_interface/AmptekHardwareInterface.i b/python/amptek_hardware_interface/AmptekHardwareInterface.i
index 127f487a4b31bb57f893bc4aabc3bd8fc982e3d0..4101576439fab34d6387e7d8e095d8ab16299216 100644
--- a/python/amptek_hardware_interface/AmptekHardwareInterface.i
+++ b/python/amptek_hardware_interface/AmptekHardwareInterface.i
@@ -4,7 +4,7 @@
     #define SWIG_FILE_WITH_INIT
     #include "AmptekHardwareInterface.h"
 %}
-
+%feature("autodoc");
 %include "numpy.i"
 %include "std_string.i"
 %init %{
diff --git a/setup.py b/setup.py
index 3c0d351fe4be0b744bc328600ae9f1cab410a430..a8975df3b2bc13692e605ce74bbd70772f420a40 100644
--- a/setup.py
+++ b/setup.py
@@ -15,8 +15,8 @@ except AttributeError:
 # HexitecIO extension module
 _AmptekHardwareInterface = Extension("amptek_hardware_interface._AmptekHardwareInterface",
                    ["python/amptek_hardware_interface/AmptekHardwareInterface.i",] + ["src/" + f for f in os.listdir("src") if os.path.isfile("src/" + f)],
-                   include_dirs = [numpy_include, "include"],
-                   swig_opts=['-c++',"-modern", "-nomodernargs" ],
+                   include_dirs = [numpy_include, "include", "src"],
+                   swig_opts=['-c++',"-doxygen"],
                    extra_compile_args = ["-std=c++11", "-g"], 
                    libraries=["usb-1.0"]
                    )