Header stuff again

 Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/TedStudley/Cereal-Hack-3