Issue #46

---