Fix and improve documentation
Merge pull request #2 from eric-smartlove/improve-documentation

Fix and improve documentation