some changes
Merge branch 'master' into plugin2 to make some changes on index