This is a change in my fork.

I want to add this code into the master

Steve