Merge pull request #626 from dangowrt/improve-wpa-eap