Re-work body and Header handling
Merge branch 'develop' of github.com:andrew-consulting-group/kazoo into develop