diff --git a/CMakeLists.txt b/CMakeLists.txt
index d79d1c8756f4e155f7b5d515c4e93bfa85ae364a..fb3e86e13ccb5d1d06ec7ce4c73fe53d81132a3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,23 +11,24 @@
 
 ##################################################################################
 # Modified by Jacob Brown (jb21g14) on 14/05/2018
+# Modified by James Scrase (jms1g19) on 08/04/2021
 # For use by Computer System 2 Students at the University of Southampton
 # All settings are based on an at90usb1286 chip, using dfu-programmer as the upload tool
 #
-# N.B.: The CMake proejct needs to be reloaded every time a new source file is created
+# N.B.: The CMake project needs to be reloaded every time a new source file is created
 #
 # Setup Instructions (CLion):
-# create a new CLion project
-# Set the cmake_minimum_required on line 37 to the version of cmake you are using e.g. "cmake_minimum_required(VERSION 3.0)"
-# Set the name on line 59 of this file to the CLion project name you set above e.g. "project(Week4_task C)"
-# copy this and the generic-gcc-avr.cmake into the root folder directory of the CLion project overwriting any conflicts
+# Create a new CLion project
+# Set cmake_minimum_required on line 38 to the version of cmake you are using e.g. "cmake_minimum_required(VERSION 3.17)"
+# Set the name on line 60 of this file to the CLion project name you set above e.g. "project(Week4_task C)"
+# Copy this and generic-gcc-avr.cmake into the root folder of the CLion project overwriting any conflicts
 # Reload the CMake project in CLion
 #
 # Setup Instructions (general):
-# Set the cmake_minimum_required on line 37 to the version of cmake you are using e.g. "cmake_minimum_required(VERSION 3.0)"
-# Set the name on line 51 of this file to anything you like e.g. "project(Week4_task C)"
+# Set cmake_minimum_required on line 38 to the version of cmake you are using e.g. "cmake_minimum_required(VERSION 3.17)"
+# Set the name on line 60 of this file to anything you like e.g. "project(Week4_task C)"
 #
-# Any issues you can email me at jb21g14@soton.ac.uk or create an issue in the github project
+# Any issues you can email me at jms1g19@soton.ac.uk (or the previous author at jb21g14@soton.ac.uk) or create an issue on the GitLab project
 ##################################################################################
 
 ##################################################################################
@@ -88,6 +89,8 @@ else(DEFINED ENV{AVR_FIND_ROOT_PATH})
         set(CMAKE_FIND_ROOT_PATH "/usr/lib/avr")
     elseif(EXISTS "/usr/local/CrossPack-AVR")
         set(CMAKE_FIND_ROOT_PATH "/usr/local/CrossPack-AVR")
+    elseif(EXISTS "C:\\msys64\\mingw64\\avr")
+        set(CMAKE_FIND_ROOT_PATH "C:\\msys64\\mingw64\\avr")
     else(EXISTS "/opt/local/avr")
         message(FATAL_ERROR "Please set AVR_FIND_ROOT_PATH in your environment.")
     endif(EXISTS "/opt/local/avr")