First commit in this branch.
Merge pull request #1 from neonowy/non-wireless

First commit in this branch.