kristina's torus
Merge pull request #646 from awodey/master

kristina's torus