Issue #15 complete.