Update the main page
Merged with github version