Issue 129 Implementation
Requested changes in pull request review
Code review with Hugo Corbucci
Merge pull request #137 from raphaelmolesim/issue-129

Closes #129. Need to adjust some tabs and all but I'll take care of it