Updates for issue #20