Issue #41

---