Added footer
merging of addFooter branch