Submitted PR #34, plus a few meetings