Closes issue #55