Code Review pull request

Does this belong on master?