Issue #39

---