Closes issue #278