updates to resolve issue #71