Manually merge Josh's pull request (#8)