Merge pull request #555 from wigyori/cc-hostapd2