Issue #49

---