Merge pull request #3 from steven-simon/tempBranch

Merge pull request #2 from steven-simon/master
Merge pull request #4 from steven-simon/tempBranch

test of pull request
Merge pull request #5 from steven-simon/master

t