Updates for issue #96