30 minutes method
Merge pull request #29 from MaximeHerne/30minutes-method

30 minutes method
fix conflict