Changes for issue #59.