First pass for #344: [H000329] Rep. Doc Hastings.
Merge pull request #840 from schmich/patch-3

First pass for #344: [H000329] Rep. Doc Hastings.