diff --git a/Makefile b/Makefile
index e4af1d2..a2526c0 100644
--- a/Makefile
+++ b/Makefile
@@ -29,9 +29,14 @@ profile:
 	killall php
 
 apidocs:
-	apigen --title Ratchet -d reports/api -s src/ \
-		-s vendor/react \
-		-s vendor/guzzle \
-		-s vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session \
-		-s vendor/symfony/routing/Symfony/Component/Routing \
-		-s vendor/evenement/evenement/src/Evenement
+	apigen --title Ratchet -d reports/api \
+		-s src/ \
+		-s vendor/ratchet/rfc6455/src \
+		-s vendor/react/event-loop/src \
+		-s vendor/react/socket/src \
+		-s vendor/react/stream/src \
+		-s vendor/psr/http-message/src \
+		-s vendor/symfony/http-foundation/Session \
+		-s vendor/symfony/routing \
+		-s vendor/evenement/evenement/src/Evenement \
+		--exclude=vendor/symfony/routing/Tests \
diff --git a/README.md b/README.md
index 883f8e6..3f1a345 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-#Ratchet
+# Ratchet
 
 [![Build Status](https://secure.travis-ci.org/ratchetphp/Ratchet.png?branch=master)](http://travis-ci.org/ratchetphp/Ratchet)
 [![Autobahn Testsuite](https://img.shields.io/badge/Autobahn-passing-brightgreen.svg)](http://socketo.me/reports/ab/index.html)
@@ -7,7 +7,7 @@
 A PHP library for asynchronously serving WebSockets.
 Build up your application through simple interfaces and re-use your application without changing any of its code just by combining different components.
 
-##Requirements
+## Requirements
 
 Shell access is required and root access is recommended.
 To avoid proxy/firewall blockage it's recommended WebSockets are requested on port 80 or 443 (SSL), which requires root access.
@@ -24,7 +24,7 @@ Need help?  Have a question?  Want to provide feedback?  Write a message on the
 
 ---
 
-###A quick example
+### A quick example
 
 ```php
 <?php