Added torus and stuff!
Merge pull request #1 from cimeies/master

Added torus and stuff!