Closes issue #17