Merged my changes with BryanJWillGuy.