Adding modification from branche
Merge pull request #1 from cvigny/adding_files

Adding modifications from branche. But didn't manage to add a file. Just trying merge between branch.