make minor corrections for pull request
Fixed merge conflicts with shaner