Master commit 3 from TJ fork (again)

Please check again and merge the change to the main repo.

![Uploading Please.PNG . . .]()