Revert ""

This reverts commit b0bbaaa0638ae0800d28e46fb56502b8be0485a6.
Revert "Revert """

This reverts commit d9eea59e08a08021e88a83f6896379fee7f2e07f.
Merge branch 'master' of https://github.com/CamaronSA/CookBook