Issue #31 - addressing comments part 3