Rotation merge, closes #20