Work on issue #21 (not completed yet)