Issue #52

---