Bugfix #21 and improvements in the rotation animation