glass first commit
Merge https://github.com/Kvetch/Kludge-Collector