Added boat rotation
Merge master