keep track of z indices
Merge branch 'master' into gh-pages