diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt
index 159ef4bc..ce03da9c 100644
--- a/pyiec61850/CMakeLists.txt
+++ b/pyiec61850/CMakeLists.txt
@@ -1,14 +1,13 @@
-# The SWIG functions/macros used in this module, swig_add_module and swig_add_library
-# are not available in CMake versions earlier than 3.8
-# cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.12)
+
+set(CMAKE_POLICY_DEFAULT_CMP0078 NEW)
 
 find_package(SWIG REQUIRED)
 include(${SWIG_USE_FILE})
 
-find_package(PythonInterp ${BUILD_PYTHON_VERSION} REQUIRED)
-find_package(PythonLibs ${PYTHON_VERSION_STRING} EXACT REQUIRED)
+find_package(Python COMPONENTS Interpreter Development REQUIRED)
 
-include_directories(${PYTHON_INCLUDE_PATH})
+include_directories(${Python_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 set(CMAKE_SWIG_FLAGS "")
@@ -20,25 +19,21 @@ else()
     set(LIBS iec61850-shared)
 endif()
 
-if(${CMAKE_VERSION} VERSION_LESS 3.8)
-    swig_add_module(iec61850 python iec61850.i)
-else()
-    swig_add_library(iec61850
-        LANGUAGE python
-        SOURCES iec61850.i
-    )
-endif()
+swig_add_library(pyiec61850
+    LANGUAGE python
+    SOURCES iec61850.i
+)
 
-swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS})
+swig_link_libraries(pyiec61850 ${LIBS})
 
 # Finding python modules install path
 execute_process(
-	COMMAND ${PYTHON_EXECUTABLE} -c
+	COMMAND ${Python_EXECUTABLE} -c
 	"from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())"
 	OUTPUT_VARIABLE PYTHON_SITE_DIR
 )
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${PYTHON_SITE_DIR})
-install(TARGETS _iec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyiec61850.py DESTINATION ${PYTHON_SITE_DIR})
+install(TARGETS pyiec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR})
 
-add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py)
+add_test(test_pyiec61850 ${Python_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py)
diff --git a/pyiec61850/examples/dispServerStruct.py b/pyiec61850/examples/dispServerStruct.py
index aea02b4f..2b49479b 100755
--- a/pyiec61850/examples/dispServerStruct.py
+++ b/pyiec61850/examples/dispServerStruct.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 import os,sys
-import iec61850
+import pyiec61850 as iec61850
 if __name__=="__main__":
 	hostname = "localhost";
 	tcpPort = 102
diff --git a/pyiec61850/examples/rcbSubscriptionExample.py b/pyiec61850/examples/rcbSubscriptionExample.py
index d4d05aa5..7d1243be 100644
--- a/pyiec61850/examples/rcbSubscriptionExample.py
+++ b/pyiec61850/examples/rcbSubscriptionExample.py
@@ -27,7 +27,7 @@ The user needs to:
 
 import time
 import sys
-import iec61850
+import pyiec61850 as iec61850
 
 
 def open_connection(ip_address, mms_port):
diff --git a/pyiec61850/iec61850.i b/pyiec61850/iec61850.i
index 254fec64..4cdbe0ea 100644
--- a/pyiec61850/iec61850.i
+++ b/pyiec61850/iec61850.i
@@ -1,5 +1,5 @@
 /* File : iec61850.i */
-%module(directors="1") iec61850
+%module(directors="1") pyiec61850
 %ignore ControlObjectClient_setTestMode(ControlObjectClient self);
 %ignore CDA_OperBoolean(ModelNode* parent, bool isTImeActivated);
 %ignore LogicalNode_hasBufferedReports(LogicalNode* node);
diff --git a/pyiec61850/test_pyiec61850.py b/pyiec61850/test_pyiec61850.py
index aceb3fdb..6f6d8cdd 100755
--- a/pyiec61850/test_pyiec61850.py
+++ b/pyiec61850/test_pyiec61850.py
@@ -6,7 +6,7 @@ import traceback
 import signal
 import sys
 sys.path.append('.')
-import iec61850
+import pyiec61850 as iec61850
 def signal_handler(signal, frame):
 	global running
 	running =0
diff --git a/pyiec61850/tutorial.md b/pyiec61850/tutorial.md
index ce766cab..1e6b4f4f 100644
--- a/pyiec61850/tutorial.md
+++ b/pyiec61850/tutorial.md
@@ -2,14 +2,27 @@
 Before building you should install swig and python.
 To build python bindings you have to turn on the BUILD\_PYTHON\_BINDINGS flag in CMake from cmake-gui or in command line:
 ```sh
-$ cmake -DBUILD_PYTHON_BINDINGS=ON .
+$ mkdir build && cd build
+$ cmake -DBUILD_PYTHON_BINDINGS=ON ..
+```
+
+Then compile the library and install it:
+```sh
+$ make
+$ sudo make install
+```
+CMake and swig will automatically detect your python version and install the python library in python library directories.
+
+For running the integrated tests:
+```sh
+$ make test
 ```
-Then compile the library and install it. CMake and swig will automatically detect your python version and install the python library in python library directories.
 
 pyiec61850 library is to be imported calling 
 ```python
-import iec61850
+import pyiec61850 as iec61850
 ```
+
 # Client tutorial
 
 The python bindings works similarly to the basic C library. However there are some differences: