updates for issue #21