modified new file
Merge pull request #2 from johngruen/new-branch

modified new file