Merge pull request #630 from rezonant/capacitors

Capacitor bank fixes