Merge pull request #131 from mabrains/diode_all_variants