Merge thombrg's pull request