Issue #39 (draft)