Updates based on QA feedback.
Merge pull request #28 from mhaskel/1.0.x-doc

Updates based on QA feedback.