diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..865cb3e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. macOS Catalina, Windows 10 1903, Ubuntu 19.10]
+ - Python Video Annotator Version [e.g. 3.306]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..bbcbbe7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/README.md b/README.md
index ab11bf7..4468cf7 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,8 @@ How to install:
     pip install python-video-annotator
     ```
 
-If you are having issues (e.g., MacOS Catalina):
+## Intel Mac installation
+### MacOS Catalina
 
 1. Start with a fresh Virtual Environment (highly recommended) on your preferred Python distribution with Python 3.6:
    * example with Anaconda in Anaconda Prompt
@@ -62,6 +63,49 @@ If you are having issues (e.g., MacOS Catalina):
     pip install python-video-annotator
     ```
 
+### MacOS Mojave
+
+1. Start with a fresh Virtual Environment (highly recommended) on your preferred Python distribution with Python 3.8:
+   * example with Anaconda in Anaconda Prompt
+
+    ```bash
+    conda create -n videoannotator python=3.8
+
+    ...
+
+    conta activate videoannotator
+    ```
+
+2. Install PyFormsGUI 5 first
+
+    ```bash
+    pip install pyforms-gui==5
+    ```
+
+3. Downgrade PyQt5 and QScintilla:
+
+    ```bash
+    pip install --upgrade qscintilla==2.11.4 pyqt5==5.14.1 pyqtwebengine==5.14.0
+    ```
+
+4. Install missing packages
+
+    ```bash 
+    pip install opencv-python-headless PyOpenGL_accelerate
+    ```
+
+5. Install Python Video Annotator, ignoring dependencies (will be installed afterwards since it has a conflict with opencv version)
+
+    ```bash
+    pip install python-video-annotator==3.306 --no-deps
+    ```
+
+6. Install python-video-annotator dependencies except the one that created conflicts (older version of opencv-python)
+
+    ```bash
+    pip install geometry-designer modular-computer-vision-api modular-computer-vision-api-gui pypi-xmlrpc python-video-annotator-models python-video-annotator-models-gui python-video-annotator-module-background-finder python-video-annotator-module-contours-images python-video-annotator-module-create-paths python-video-annotator-module-deeplab python-video-annotator-module-distances python-video-annotator-module-eventstats python-video-annotator-module-find-orientation python-video-annotator-module-import-export python-video-annotator-module-motion-counter python-video-annotator-module-path-editor python-video-annotator-module-path-map python-video-annotator-module-regions-filter python-video-annotator-module-smooth-paths python-video-annotator-module-timeline python-video-annotator-module-tracking python-video-annotator-module-virtual-object-generator scipy send2trash simplejson sklearn
+    ```
+
 How to run:
 
 1. After the installation completes, you can start Python Video Annotator with:
diff --git a/plugins/pythonvideoannotator-module-idtrackerai b/plugins/pythonvideoannotator-module-idtrackerai
index 8df27ec..24866ee 160000
--- a/plugins/pythonvideoannotator-module-idtrackerai
+++ b/plugins/pythonvideoannotator-module-idtrackerai
@@ -1 +1 @@
-Subproject commit 8df27ec1dbe093a3b1d9c051e4bf106832831759
+Subproject commit 24866ee28a514a8f1b0a3186800e84280c1d4cd4