RF: got the terms mixed up a bit.
Merge pull request #3 from arokem/swederik-enh/TensorMode

RF: got the terms mixed up a bit.