merge w. giulio (master)

Yes, I am afraid I made a mistake when I first wrote it last summer. 
Dimensional analysis shows that the second term in parentheses should be length^-2.