Finalized torus implementation - Closed issue #8