Merge pull request #6 from ipa-rmb/fuerte_dev

same updates as for electric_dev: merge with new code from goa-tz, tested for electric and fuerte