Fix for lack of 'output' parameter in 'cross' transform and test cases
Resolve merge conflicts on #90.