Secondary Index I
Merge pull request #284 from tonyhuang/index

Secondary Index I
Fix compiler errors from secondary index pull