Added wimax (closes #21)