fixed main page
Merge branch 'master' into ryan