Changes in PR as per request by project owner (umpirsky)