This is a second pull request, this time with user references in the description.

@chuckharmston @andymckay