Closes Issue #60