added (fixed) implementation of zipWithIndex
Merge remote-tracking branch 'origin/master'