diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..2ef0f475
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,24 @@
+name: Build C++
+
+on:
+  push:
+    branches: "**"
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  install:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y -f build-essential g++ cmake
+  build:
+    needs: install
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - name: Build project
+        run: g++ -std=c++17 main.cpp
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index 5411e7a3..23d2a8ce 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,25 +1,28 @@
 #include <iostream>
 #include <cmath>
 
-using std::endl;
-using std::cin;
-using std::cout;
-
 int main()
 {
-    cout << "THE FIRST EXAMPLE MATH DISPLAY!\n";
-    cout << "Hi, please enter two whole numbers: ";
+    std::cout << "THE FIRST EXAMPLE MATH DISPLAY!\n";
+    std::cout << "Hi, please enter two whole numbers: ";
 
     int x,y;
 
-    cin >> x >> y;
-    cout << "Addition: " << x + y << endl;
-    cout << "Subtraction: " << x - y << endl;
-    cout << "Multiplication: " << x * y << endl;
-    cout << "Division: " << x / y << endl;
-    cout << "Remainder: " << x % y << endl;
-    cout << "Square Root: " << sqrt(x) << endl;
-    cout << "Square: " << pow(x, y) << endl;
+    std::cin >> x >> y;
+    std::cout << "Addition: " << x + y << std::endl;
+    std::cout << "Subtraction: " << x - y << std::endl;
+    std::cout << "Multiplication: " << x * y << std::endl;
+
+    if(y == 0) {
+        std::cout << "Dividing by zero is not a number." << std::endl;
+    }
+    else {
+        std::cout << "Division: " << x / y << std::endl;
+        std::cout << "Remainder: " << x % y << std::endl;
+    }
+
+    std::cout << "Square Root: " << sqrt(x) << std::endl;
+    std::cout << "Square: " << pow(x, y) << std::endl;
 
     return 0;
 }