Bringing David's beta pull request into master