Fixed build_index
Merge branch 'refs/heads/rake-task-update'