Implementation of the master, not tested.
Merge branch 'master' of https://github.com/AlexandreK88/DS512