Auto align now has rotation
Merge branch 'auto-rotation'

* auto-rotation:
  Auto align now has rotation