Merge branch 'master' into raising-the-herd
Modified for Raising The Herd
Merge pull request #1 from matalina/raising-the-herd

Raising the herd