Updates to issue #105