Improve documentation
Merge pull request #350 from kylelutz/improve-documentation

Improve documentation