forked 7.x-1.0-beta2, improved a bunch of things, made it too specific elsewhere