added indexes
Merge branch 'master' into create_api_endpoints