Fixing text and merge from master
Merge pull request #895 from dcoeurjo/TensorVoting

Tensor voting feature extraction
merge with master