Merge pull request #1 from ipa-fxm/master

Electric Update
Merge pull request #2 from ipa-fxm/electric

Merge pull request #1 from ipa-fxm/master