Merge pull request #8 from mladenw/master

Syncing ForEditing with master
Merge pull request #9 from mladenw/ForEditing

Merge pull request #8 from mladenw/master