As suggested in Issue #41