Added WPA support, appears to work well