Many modifications linked to the issue #23
This will create a new commit in order to revert the existing changes.
