Merged Josh's pull request