update for pull request and merge back to master