Changes for issue #31