updates for pull request 35