Merge pull request #2 from TerziyskiG/master

finish editing fixes #1