reworked
Merge https://github.com/gfetco/gridcore