Updated footer
Merged origin'