Merge pull request #5 from ipa-rmb/electric_dev

merged with work of goa-tz, tested quite well, works with fuerte as well