Merge pull request #5 from mladenw/master

ForEditing syncing with master
Merge pull request #7 from mladenw/ForEditing

Merge pull request #5 from mladenw/master