closes #30

The previous ZWI implementation was certainly redundant, because it
was adding the index. It has been corrected and the result is
obviously shorter.