incorporate some feedback
incorporate feedback.  Closes #12.