Issue #45

---