Closes Issue #125