Issue #82

These changes have not actually been tested on the board.