Closes issue #60, #51