Bugs fixeds
Merge branch 'master' of https://github.com/CamaronSA/CookBook