Closes Issue #40