Committed [2737612] to Plugins SVN:
Minor code improvements and WP 6.0 compatibility

Committed [2667548] to Plugins SVN:
Tested upto WP 5.9 and minor bug fixes