bugfix
Merge branch 'master' into cecha2
footer