Added some alternatives to the index
Merge branch 'master' into gzip