Made editing more robust
Updated changelog
Merge pull request #339 from mweimerskirch/edit_fix

Made editing more robust