Improved docs
Merge pull request #310 from dlsniper/docs

[WIP] Improved docs