Various

(I don't completely remember, actually...)
Merge branch 'master' of https://github.com/Carmol/powercalc