new and change
Merge pull request #1 from jdoleary/branch1

new and change pull