Changes for issue #15