Update home page
merge