Merge pull request #30 from mladenw/master

Merge pull request #29 from mladenw/ForEditing