tenpn Merge pull request #22 from rdw/teardown