Updated main page
Merge branch 'updates'