Merge pull request #681 from cshore/pull-request-wifi-interface-name