merge #3

footer fix