Merge pull request #82 from painless-security/jennifer/pull_req_feedback