Electricity improvements
Merge branch 'master' of https://github.com/ericslee/Magnet-Master-2