pull request merge minor changes