Closes issue #100