Merged in efritz/convey (pull request #25)

2017-10-04, Gary Kramlich