Fix pending tests
Merge remote-tracking branch 'upstream/master' into front-page
Merge pull request #48 from wfro/front-page

Front page