Issue #40

---