Closes issue #12