Pulling in changes
Merge branch 'Issue496' of github.com:acquaman/acquaman into Issue496
Made changes to the way that the rotation is calculated