hmmm rotation is messed up.
mend
Merge branch 'master' into fix_transform
Fixed rotation (I think).