Added show an 'o' when in the water
Merged