Changes added to resolve issue #31 .