Fix documentation, add tests
Merge pull request #2 from rjp/fix-description-add-tests

Fix documentation, add tests