Fix issue #54 and improve recovery from simple errors
Merge pull request #55 from sihil/sihil-edit-errors

Fix issue #54 and improve recovery from simple errors