Merge pull request #5 from travist/master

Master
Merge pull request #6 from travist/2.x

Update docs.
Fixing an issue with the manual configuration.