Minor changes to close issue #15