Merged some useful forks and accidentally added a goodie

This would be nice to see go in, I'd hate to maintain a fork of a project that's otherwise as good as this :)