new commits addressing issue #22

these commits address issue #22.