Added edit (backend of issue #8)