diff --git a/.circleci/config.yml b/.circleci/config.yml
index f858990..b5756e3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ version: 2.1
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
-  build-dstargateway:
+  build-dstargateway-debug-gps:
     # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
     # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
     docker:
@@ -21,13 +21,81 @@ jobs:
             sudo apt-get -y install libgtest-dev libcurl4-openssl-dev libboost-dev libgps-dev
       - run:
           name: "Build"
-          command: "make -j 3 ENABLE_DEBUG=1 USE_GPSD=1"
+          command: "make ENABLE_DEBUG=1 USE_GPSD=1"
       - run:
           name: "Run Tests"
           command: "make run-tests ENABLE_DEBUG=1 USE_GPSD=1"
+
+  build-dstargateway-gps:
+    # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
+    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
+    docker:
+      - image: cimg/base:stable
+    # Add steps to the job
+    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: |
+            sudo apt-get update
+            sudo apt-get -y install libgtest-dev libcurl4-openssl-dev libboost-dev libgps-dev
+      - run:
+          name: "Build"
+          command: "make USE_GPSD=1"
+      - run:
+          name: "Run Tests"
+          command: "make run-tests USE_GPSD=1"
+
+  build-dstargateway-debug:
+    # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
+    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
+    docker:
+      - image: cimg/base:stable
+    # Add steps to the job
+    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: |
+            sudo apt-get update
+            sudo apt-get -y install libgtest-dev libcurl4-openssl-dev libboost-dev
+      - run:
+          name: "Build"
+          command: "make ENABLE_DEBUG=1"
+      - run:
+          name: "Run Tests"
+          command: "make run-tests ENABLE_DEBUG=1"
+
+  build-dstargateway-noopt:
+    # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
+    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
+    docker:
+      - image: cimg/base:stable
+    # Add steps to the job
+    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: |
+            sudo apt-get update
+            sudo apt-get -y install libgtest-dev libcurl4-openssl-dev libboost-dev
+      - run:
+          name: "Build"
+          command: "make"
+      - run:
+          name: "Run Tests"
+          command: "make run-tests"
+
 # Invoke jobs via workflows
 # See: https://circleci.com/docs/2.0/configuration-reference/#workflows
 workflows:
   dstar-gateway-workflow:
     jobs:
-      - build-dstargateway
+      - build-dstargateway-debug-gps
+      - build-dstargateway-gps
+      - build-dstargateway-debug
+      - build-dstargateway-noopt
+
diff --git a/Common/DRATSServer.cpp b/Common/DRATSServer.cpp
index d83bbc4..38954f1 100644
--- a/Common/DRATSServer.cpp
+++ b/Common/DRATSServer.cpp
@@ -339,7 +339,7 @@ void* CDRATSServer::Entry()
 	}
 	catch (std::exception& e) {
 		std::string message(e.what());
-		CLog::logError("Exception raised in the D-RATS Server thread - \"%s\""), message.c_str();
+		CLog::logError("Exception raised in the D-RATS Server thread - \"%s\"", message.c_str());
 	}
 	catch (...) {
 		CLog::logError("Unknown exception raised in the D-RATS Server thread");
diff --git a/README.md b/README.md
index 970c7c1..29da11f 100644
--- a/README.md
+++ b/README.md
@@ -146,10 +146,11 @@ The testing framwework used is Google Test.
 
 # 5. Version History
 ## 5.1. Version 1.0
+- [**Improvement**] Improve CI to include all variants of build configurations ([#40](https://github.com/F4FXL/DStarGateway/issues/40))
 - [**Bugfix**] Fix #37 Unable to transmit multiple files (DGWVoiceTransmit) ([#37](https://github.com/F4FXL/DStarGateway/issues/37))
 - [**Bugfix**] Fix #36 Error1 Build fails in some environment ([#36](https://github.com/F4FXL/DStarGateway/issues/36))
 - [**Bugfix**] Fix #38 g++ 13 build ([#38](https://github.com/F4FXL/DStarGateway/issues/38))
-- [**Bugfix**] Add support for libgps API version greater than ([#39](https://github.com/F4FXL/DStarGateway/issues/39))
+- [**Bugfix**] Add support for libgps API version greater than 10([#39](https://github.com/F4FXL/DStarGateway/issues/39))
 ## 5.2. Version 0.7
 - [**Bugfix**] Unknow repeater entries in log when using Icom Hardware ([#34](https://github.com/F4FXL/DStarGateway/issues/34))
 - [**Bugfix**] Malformed callsign in some cases when using DV-G (NMEA) ([#33](https://github.com/F4FXL/DStarGateway/issues/33))
@@ -174,11 +175,11 @@ The testing framwework used is Google Test.
 - [**Bugfix**] Trying to connect to ghost ircDDB when no ircDDB is configured
 ## 5.5. Version 0.4
 - [**Improvement**] Add APRS status link feature ([#8](https://github.com/F4FXL/DStarGateway/issues/8))
-- [**Bugfix**] Posotions received over radio were not sent to APRS-IS when GPDS connection failed. ([#7](https://github.com/F4FXL/DStarGateway/issues/7))
+- [**Bugfix**] Positions received over radio were not sent to APRS-IS when GPDS connection failed. ([#7](https://github.com/F4FXL/DStarGateway/issues/7))
 - [**Improvement**] Bring back GPSD support ([#6](https://github.com/F4FXL/DStarGateway/issues/6))
 - [**Improvement**] Log enhancements ([#4](https://github.com/F4FXL/DStarGateway/issues/4))
 ## 5.6. Version 0.3
-- [**Improvement**] Get ride of libcongig++ dependency. When upgrading from earlier version you need to manualy delete the config file before reinstalling.
+- [**Improvement**] Get rid of libconfig++ dependency. When upgrading from earlier version you need to manualy delete the config file before reinstalling.
 ## 5.7. Version 0.2
 - [**Bugfix**] ircDDBFreeze when repeater not found ([#1](https://github.com/F4FXL/DStarGateway/issues/1))
 - Code sanitization