adding a more complete set of indexes for v0.1.0, fixing bug #14