Tim Bishop, fixes #475
Boehner, fixes #469
Merging Boehners