First pass for #128
Merge pull request #756 from an/patch-1

First pass for #128 (Rep. Tim Walberg (R-MI)