Καλησπέρα :-)

Updated patch according to your suggestions.

Your solution is much more elegant. I added you as a co-author, I hope
you don't have a problem with that. :-)

Manolis