Address issue #118.

@tb38 and @mpetri: Does this correspond to your proposal?