Fixing bugs for #465
Merge branch 'master' of github.com:unitedstates/contact-congress