Issue #156 (second draft)