making changes
Merge pull request #1 from bdpayne/branch1

making changes