Simplify and clean up docs and comments.
Merge pull request #12 from teknico/dev

Simplify and clean up docs and comments.