Pull Request - Z Order

Implements #34.