Merge pull request #13 from mladenw/master

Master Sync
Merge pull request #16 from mladenw/ForEditing

Merge pull request #13 from mladenw/master