diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2246e76b..ea22c4e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # apiDoc Changelog
 
+#### 0.10.2
+
+* Parser
+  * Add Clojure parser.
+
+
+#### 0.10.1
+
+* Bugfix: Path to apidoc-core.
+
 
 #### 0.10.0
 
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 3e48e5d1..8fbc20ac 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -2,6 +2,9 @@
 
 Thanks to all people that help to make apiDoc better!
 
+* [Danny Olson](https://github.com/dbolson)
+  * Add Clojure parser.
+
 * [Eugene Jo](https://github.com/iameugenejo)
   * Allowed options.packageInfo to overwrite default packageInfo [#177] (https://github.com/apidoc/apidoc/pull/171))
 
diff --git a/README.md b/README.md
index 8219768d..37b16d4c 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,14 @@ More examples and best practice hints: [EXAMPLES.md](https://github.com/apidoc/a
      */
    ```
 
+ * **Clojure**:
+
+   ```clojure
+   ;;;;
+   ;; This is a comment.
+   ;;;;
+   ```
+
  * **CoffeeScript**:
 
    ```coffeescript
diff --git a/bin/apidoc b/bin/apidoc
index b4b66711..948fc6f2 100755
--- a/bin/apidoc
+++ b/bin/apidoc
@@ -16,7 +16,7 @@ var nomnom = require('nomnom');
 var apidoc = require('../lib/index');
 
 var argv = nomnom
-    .option('file-filters', { abbr: 'f', 'default': '.*\\.(coffee|cs|dart|erl|go|java|js|php?|py|rb|ts|pm)$',
+    .option('file-filters', { abbr: 'f', 'default': '.*\\.(clj|coffee|cs|dart|erl|go|java|js|php?|py|rb|ts|pm)$',
             help: 'RegEx-Filter to select files that should be parsed (multiple -f can be used).' })
 
     .option('exclude-filters', { abbr: 'e', 'default': '',
diff --git a/package.json b/package.json
index e4cdd3fc..61ae024d 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   },
   "scripts": {
     "test": "npm run jshint && mocha test/",
-    "jshint": "jshint lib/ test/ --exclude test/fixtures/"
+    "jshint": "jshint lib/ test/"
   },
   "keywords": [
     "api",