bug fix V1.1
merge done
completed index V2