Updated version of the patch including changes from cboyden.