merging Ted's latest pull request