issue #63 complete