Merge pull request #45 from timburke/dev

Combine GSM Module and Card Adapter