Tentative diff for Issue #18

Tentative diff for Issue #18