Merge pull request #28 from rrthomas/master

Editing support
Fix some spelling