Added patches by Andrew Wesie which complete the implementation and remove the configuration option that was previously disabled by default.