Issue #61: further progress