Pull Request

Mostly so I can get the fix for the rotation bug