Closes issue #13