Creating index
Merge https://github.com/KingSavate/tests