Merge pull request #22 from wilbertom/master

Work towards the home page.