Two versions in one day? Preposterous.

@catch22 gave the plugin a very solid once-over giving us multiple improvements and a more readable implementation.