merge in my several improvements to the plugin (see README for change list)