diff --git a/keywords.txt b/keywords.txt
index 45ada90..50b7076 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -2,17 +2,17 @@
 # Datatypes (KEYWORD1)
 #######################################
 
-SerialCommand KEYWORD1
+SerialCommand	KEYWORD1
 
 #######################################
 # Methods and Functions (KEYWORD2)
 #######################################
 
-addCommand        KEYWORD2
-setDefaultHandler KEYWORD2
-readSerial        KEYWORD2
-clearBuffer       KEYWORD2
-next              KEYWORD2
+addCommand	KEYWORD2
+setDefaultHandler	KEYWORD2
+readSerial	KEYWORD2
+clearBuffer	KEYWORD2
+next	KEYWORD2
 
 #######################################
 # Instances (KEYWORD2)
diff --git a/library.json b/library.json
new file mode 100644
index 0000000..07897af
--- /dev/null
+++ b/library.json
@@ -0,0 +1,12 @@
+{
+  "name": "SerialCommand",
+  "keywords": "serial, communication, protocol",
+  "description": "A Wiring/Arduino library to tokenize and parse commands received over a serial port.",
+  "repository":
+  {
+    "type": "git",
+    "url": "https://github.com/kroimon/Arduino-SerialCommand.git"
+  },
+  "frameworks": "arduino",
+  "platforms": "atmelavr"
+}