Merge pull request #302 from alex/beef-up-the-index

More info in teh index