Cookbook refactored
Merge pull request #25 from lewagon/cookbook-refactored

Cookbook refactored
Solve conflict