Merge pull request #29 from mladenw/ForEditing

For editing