Merge pull request #1 from BBasile/Coedit/master

Coedit/master