Incorporate some feedback.
Merge pull request #138 from docfaraday/feedback_fixes

Incorporate some feedback.