Refactor times->multiplicity, add feature index.
Merge branch 'develop'