Headers! And stuff!
Merge branch 'master' of https://github.com/TedStudley/Cereal-Hack-3