diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
deleted file mode 100644
index 9e8694c8..00000000
--- a/.github/workflows/CI.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# GitHub workflow to enable continuous integratoin
-name: Continuous Integration
-
-# This workflow is triggered on pushes to the repository.
-on: [push, pull_request]
-
-jobs:
-  build:
-  name: Testing
-  runs-on: ubunto-latest
-  steps:
-  - name: actions/checkout@master
-  - name: mkdir bin
-    run: mkdir bin; cd bin
-  - name: cmake
-    run: cmake ..
-  - name: make
-    run: make
-  - name: make test
-    run: make test
diff --git a/.github/workflows/CI2.yml b/.github/workflows/CI2.yml
deleted file mode 100644
index 33bcda7b..00000000
--- a/.github/workflows/CI2.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: CI
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    
-    steps:
-    - uses: actions/checkout@v1
-    - name: Run a one-line script
-      run: echo Hello, world!
-    - name: Run a multi-line script
-      run: |
-        echo Add other actions to build,
-        echo test, and deploy your project.
diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml
new file mode 100644
index 00000000..7b57efa7
--- /dev/null
+++ b/.github/workflows/ContinuousIntegration.yml
@@ -0,0 +1,36 @@
+# GitHub workflow to enable continuous integratoin
+name: Continuous Integration
+
+# This workflow is triggered on pushes and pull requests to the repository.
+on: 
+  push:
+    branches: '*'
+  pull_request: 
+    branches: 'master'
+
+jobs:
+  build:
+    runs-on: ${{matrix.os}}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, macos-10.15]
+        build_type: [ Debug, Release ]
+        vFortran: [ gfortran-8 ]
+
+    steps:
+    - name: which gfortran
+      run: |
+        which ${{matrix.vFortran}}
+        ${{matrix.vFortran}} --version
+    - uses: actions/checkout@v2
+    - name: mkdir bin
+      run: mkdir bin 
+    - name: cmake
+      run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} ..  
+      working-directory: ./bin
+    - name: make
+      run: make -j
+      working-directory: ./bin
+    - name: ctest
+      run: ctest -j
+      working-directory: ./bin
diff --git a/README.md b/README.md
index 33b15614..08519eab 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+![](https://github.com/njoy/NJOY2016/workflows/Continuous%20Integration/badge.svg)
+
 # NJOY2016
 
  The NJOY Nuclear Data Processing System is a modular computer code designed to read evaluated data in ENDF format, transform the data in various ways, and output the results as libraries designed to be used in various applications. Each module performs a well defined processing task. The modules are essentially independent programs, and they communicate with each other using input and output files, plus a very few common variables.