Hymn Lyrics Search - Name That Hymn

Can somebody please help me get the words of this song. I can only remember the bits of it that went something like:

verse : the master has promised that he will return
on a night when theres no one expecting to see him at all
keep oil in the lamps so they are ready to burn
on a night ........

chorus : When he comes back when he comes
Our lamps will be burning to welcome him when he comes back

When he comes back, when he comes back,
Our lamps will be burning to welcome him when he comes back.

The master has proclaimed that he will return
On a night when there's no one expecting to see him at all.
Keep oil in the lamps so they're ready to burn
On the night of his secret, when those who are waiting he'll call.
Chorus

Look not for his presence in heaven's dark space;
By the light of our living on earth, we'll discover his face.
For the face of the master is always at hand
In the hungry, the poor, in the stranger - in the face of a man.
Chorus

This stranger will search for his home in the night,
And then how will he find it, unless all the windows are bright?
But if we are waiting, why then, he'll come in -
And there'll be a homecoming with dancing and singing within.
Chorus

Malcolm Stewart (born 1925)
© 1969 Stainer & Bell Ltd