Fixed editing, closes #20