Merge pull request #1 from mikesherson/master

index change