diff --git a/cmake/FindCODEC2.cmake b/cmake/FindCODEC2.cmake
index 728d208..32f6edb 100644
--- a/cmake/FindCODEC2.cmake
+++ b/cmake/FindCODEC2.cmake
@@ -1,8 +1,12 @@
 # - Try to find CODEC2
 # Once done this will define
 
-#seems to work now, will want to test on multiple platforms
-#I just copied RTLSDR and modified it
+#Seems to work on Cygwin as well now -- more testing for may be required
+# Not sure what causes the 'Package 'codec2', required by 'virtual:world', not found' message, but seems to work anyways
+# -- Checking for module 'codec2'
+# --   Package 'codec2', required by 'virtual:world', not found
+# -- Found CODEC2: /usr/local/lib/libcodec2.dll.a
+
 if (NOT CODEC2_FOUND)
 
   find_package(PkgConfig)
@@ -10,11 +14,11 @@ if (NOT CODEC2_FOUND)
   set(CODEC2_DEFINITIONS ${PC_CODEC2_CFLAGS_OTHER})
 
   find_path(CODEC2_INCLUDE_DIR
-    NAMES codec2.h
+    NAMES codec2/codec2.h codec2.h
     HINTS ${CODEC2_PKG_INCLUDE_DIRS})
 
   find_library(CODEC2_LIBRARY
-    NAMES codec2
+    NAMES codec2/codec2 codec2
     HINTS ${CODEC2_PKG_LIBRARY_DIRS})
 
   set(CODEC2_LIBRARIES ${CODEC2_LIBRARY})