Add footer support
Add footer support
Merge branch 'neilkimmett-master'