Incorporate feedback.
Merge pull request #141 from docfaraday/incorporate_feedback

Incorporate feedback.