Header changes
Merge branch 'master' of https://github.com/PogiNate/freezing-tribble