More cleaning
Merge pull request #65 from DgFutureLab/development

More cleaning