Finishing CFS
Merge pull request #10 from mladenw/Mladens_Edit

Finishing CFS