diff --git a/clib.json b/clib.json
index 5a5fafba..bbdd1cc9 100644
--- a/clib.json
+++ b/clib.json
@@ -32,6 +32,7 @@
     "include/Functions.hpp",
     "include/Gamepad.hpp",
     "include/Image.hpp",
+    "include/Keyboard.hpp",
     "include/Material.hpp",
     "include/Matrix.hpp",
     "include/Mesh.hpp",
diff --git a/include/Keyboard.hpp b/include/Keyboard.hpp
index b111d2c5..635fb4b0 100644
--- a/include/Keyboard.hpp
+++ b/include/Keyboard.hpp
@@ -47,14 +47,14 @@ class Keyboard {
     /**
      * Get key pressed (keycode), call it multiple times for keys queued, returns 0 when the queue is empty
      */
-    static bool GetKeyPressed() {
+    static int GetKeyPressed() {
         return ::GetKeyPressed();
     }
 
     /**
      * Get char pressed (unicode), call it multiple times for chars queued, returns 0 when the queue is empty
      */
-    static bool GetCharPressed() {
+    static int GetCharPressed() {
         return ::GetCharPressed();
     }
 };
diff --git a/include/raylib-cpp.hpp b/include/raylib-cpp.hpp
index 88cd6ef9..b2feba0c 100644
--- a/include/raylib-cpp.hpp
+++ b/include/raylib-cpp.hpp
@@ -42,6 +42,7 @@
 #include "./Functions.hpp"
 #include "./Gamepad.hpp"
 #include "./Image.hpp"
+#include "./Keyboard.hpp"
 #include "./Material.hpp"
 #include "./Matrix.hpp"
 #include "./Mesh.hpp"
diff --git a/tests/raylib_cpp_test.cpp b/tests/raylib_cpp_test.cpp
index 6d188c61..375eff46 100644
--- a/tests/raylib_cpp_test.cpp
+++ b/tests/raylib_cpp_test.cpp
@@ -69,6 +69,11 @@ int main(int argc, char *argv[]) {
         AssertEqual(image.GetHeight(), 50);
     }
 
+    // Keyboard
+    {
+        AssertNot(raylib::Keyboard::IsKeyPressed(KEY_MINUS));
+    }
+
     // raylib::LoadDirectoryFiles()
     {
         std::vector<std::string> files = raylib::LoadDirectoryFiles(::GetWorkingDirectory());