Integrating rotations from PR 641
Comment update
Merge pull request #680 from kerautret/PR641WithAlineMaster

Integrating rotations from PR 641