Changes for issue #70