Addresses issue #299.
This also fixes up the IRQ for the PYBOARD4 USERSW although I was unable to test that functionality.