Manually merged in changes from sdball. Thank you!