This closes issue #8