Modified index page
Merge branch 'iss54'