Merge pull request #176 from prattmic/reset