fix #1
Merge branch 'feature/rotation'