Generic edit and new changes 2
Merge pull request #15 from stevergill/steve101114v44

Generic edit and new changes 2