added indices
Merge branch 'master' into deploy
version bump
Merge branch 'master' into deploy