Add teardown amongst other various optimizations
Merge pull request #1 from ianks/teardown

Add teardown amongst other various optimizations