Reverting the library back to JoelLarson's design and repatching it for 1.4+ servers.
Merge branch 'master' into reworking