merge Jeremy's pull request