Finishing CFS
Merge pull request #9 from mladenw/ForEditing

Merge pull request #8 from mladenw/master
Merge pull request #10 from mladenw/Mladens_Edit

Finishing CFS
Merge pull request #11 from mladenw/master

Sync with Master