made updates for pull request.
merge with master