Closes issue #121