Closes Issue #41