Well, I am new at maintaining the NAR plugin, so there are a couple of things that are different now ;-)

I would prefer it if you'd use proper indentation only in the lines that you added. Otherwise it is way too difficult to review your changes, having to pick out the functional from the whitespace changes...