changes merged in accordance with pull request