Most of the work was done by koobs. Thank you! PR: 228268 Submitted by: koobs Reported by: Christopher Hall