kisom Merge pull request #2 from dgryski/cleanups …