Fixing bugs.
erge branch 'master' of https://github.com/AlexandreK88/DS512