Slight modification to Index file
Merge branch 'dev'