Merge pull request #11 from mladenw/master

Sync with Master
Merge pull request #12 from mladenw/ForEditing

Merge pull request #11 from mladenw/master