Hymn Lyrics Search - Name That Hymn

I am looking for a song that was sung by a gospel group that used to come to my church. The song was named Stormy Water, i think i twent something like this...
1.] Stormy waters all around me waves are rough and rollin high I messed it all I plainly see, there the fairest of all ages and the keeper hears my cry, its the rock of ages cleft for me.

Verse 1
Stormy waters all around me waves are rough and rolling high
But amidst it all I plainly see
There's a fairest of all havens and the keeper hears my cry
To the rock of ages cleft for me

Chorus
Stormy waters round me, thunder rolls
How the mighty billows tossed my soul
Lord to find sweet comfort when I see
To the rock of ages cleft for me

Verse 2
Not a moment spent in slumber restlessly I sail along
Then my Savior dear hears myself plead
Soon the ocean waves are peaceful and my heart breaks forth in song
To the rock of ages cleft for me

Verse 3
Now the homeland I am nearing harbor lights come into view
And the welcome bells ring out so free
Just a few short days of sailing then I'll have a life that's new
To the rock of ages cleft for me