Merge pull request #49 from AntoineCezar/issue_42

Solve Issue 42