Issue #18 (Digitzed by Celt)

---