Closes issue #23