Issue 45

This implements the changes necessary for issue #45.