Generic edit and new changes
Merge pull request #14 from stevergill/steve101114v77

Generic edit and new changes