OK, really did it this time
Merge branch 'master' of https://github.com/collex/collex