Michael Phelps announces engagement to Miss California 2010

Eighteen-time Olympic champion Michael Phelps has announced that he is engaged to former Miss California Nicole Johnson.

The couple, who have been in an on-off relationship over the last few years, confirmed the news after Phelps completed a six-month suspension from USA Swimming following a drunk-driving arrest.

Phelps announced the engagement via his Instagram page by posting a photo of the couple together, along with the message: "She said yes."

The 29-year-old is the most successful Olympian of all time having secured 22 medals.

She said yes😁😁😁 @nicole.m.johnson. (Photo credit to @arschmitty )

A photo posted by Michael Phelps (@m_phelps00) on Feb 21, 2015 at 10:49pm PST