Changes from Paul Hoffman
Merge pull request #1 from paulehoffman/forediting

Changes from Paul Hoffman