another pull request from gmail guy at 348