Fixing changes
Merge pull request #78 from benoitmangili/fixing_changes

Fixing changes