Merge pull request #262 from pulsar-edit/the-quest-for-electron

Merge pull request #262 from pulsar-edit/the-quest-for-electron #182