Got rid of a temp variable.
Merge branch 'master' into fix-zone-graph
Removed some comments, added one test.