Merge pull request #17 from westbywest/master

Issue with BSSID set for AP, and encryption key