Closes issue #16