Changes for issue #20