Closes issue #24