Merge pull request #8 from mladenw/master

Syncing ForEditing with master