Merge pull request #248 from prattmic/cleanup