Closes issue #127