Olympic swimming champion Michael Phelps is set to dive straight into marriage with former Miss California, Nicole Johnson.

Phelps, an 18-time year Olympic gold medallist, announced via social media that he is marrying his long-time girlfriend. The two had been dating on and off for the past few years prior to the announcement.

Like Us on Facebook

Through Instagram, Phelps posted a photo of him and Johnson hugging in the snow. The photo, which was taken by teammate Allison Schmitt, bears the caption: "She said yes."

The engagement comes just as Phelps' six month suspension from USA Swimming for his second drunk driving arrest is coming to an end. It ends in a couple weeks, on March 6. He is then expected to return to competition at Mesa, Arizona the following month.

Last September, the then 29-year old swimmer went through 45 days of inpatient treatment and rehabilitation. He then continued his therapy, enrolling in Alcoholics Anonymous.

December saw him plead guilty to the Driving Under the Influence (DUI) charge, effectively placing him on probation by a judge who warned him that if he has not gotten the message, the only remaining option would be jail.

Phelps has already stepped away from competitive swimming after the London Olympics in 2012. He said that he had already reached all the goals he set for himself and did not wish to compete in his 30s.

At the time, he had already won a record breaking eight gold medals at the Beijing Games. Overall though, he had won 18 golds and 22 in total. The sheer number of medals makes Phelps the most decorated athlete in Olympic history.

However, Phelps could not stay away and returned to training in 2013, subsequently winning medals at the Pan Pacific Championships. 

He is currently banned from this summer's world championships in Russia, but will be heading to the 2016 Olympics.

Tagsnicole johnson, michael phelps, engaged, Miss California, Olympic Swimmer